Commit e67b7f42 authored by Bas Zoetekouw's avatar Bas Zoetekouw Committed by Dmitry Smirnov

Imported Debian snapshot 0~git-20061221162513-2

parent 9b41b2ae
blktrace (0~git-20061221162513-2) experimental; urgency=low
* Fixed a typo in the description (Thanks to Loïc for noticing!)
(closes: #405935)
* Rather than defining our own store_barrier() for each architecture, just
use wmb() from <asm/system.h>. This fixes build problems on lots of
architectures (I hope).
(closes: #406004)
* Added Build-depends on patch
* Fix applying of pacthes in debian/rules. This would fail if there was
more than 1 patch present
-- Bas Zoetekouw <bas@debian.org> Sat, 13 Jan 2007 16:00:03 +0100
blktrace (0~git-20061221162513-1) experimental; urgency=low
* Initial release (closes: #402076)
......
......@@ -2,7 +2,7 @@ Source: blktrace
Section: utils
Priority: optional
Maintainer: Bas Zoetekouw <bas@debian.org>
Build-Depends: debhelper (>=5), texlive-latex-base | tetex-bin
Build-Depends: debhelper (>=5), patch, linux-kernel-headers, texlive-latex-base | tetex-bin
Standards-Version: 3.7.2
Package: blktrace
......@@ -18,7 +18,7 @@ Description: utilities for block layer IO tracing
output (via blkparse).
.
blkparse: A utility which formats events stored in files, or when
run in \emph{live} mode directly outputs data collected by blktrace.
run in live mode directly outputs data collected by blktrace.
.
Running blktrace requires a patch to the Linux kernel which includes the
kernel event logging interfaces, and patches to areas within the block
......
--- blktrace-0~git-20061221162513/barrier.h.orig 2007-01-13 16:02:21.806205577 +0100
+++ blktrace-0~git-20061221162513/barrier.h 2007-01-13 17:01:32.615554863 +0100
@@ -1,18 +1,16 @@
#ifndef BARRIER_H
#define BARRIER_H
-#if defined(__ia64__)
-#define store_barrier() asm volatile ("mf" ::: "memory")
-#elif defined(__x86_64__)
-#define store_barrier() asm volatile("sfence" ::: "memory")
-#elif defined(__i386__)
-#define store_barrier() asm volatile ("": : :"memory")
-#elif defined(__ppc__) || defined(__powerpc__)
-#define store_barrier() asm volatile ("eieio" : : : "memory")
-#elif defined(__s390__) || defined(__s390x__)
-#define store_barrier() asm volatile ("bcr 15,0" : : : "memory")
-#else
-#error Define store_barrier() for your CPU
-#endif
+/* workaround for bugs in linux-kernel-headers */
+#define __always_inline inline
+
+/* workaround for bugs in linux-kernel-headers */
+#include "blktrace.h" /* defines u8 and u32 */
+#include <asm/types.h> /* defines __u16 */
+typedef __u16 u16;
+
+
+#include <asm/system.h> /* defines wmb() */
+#define store_barrier() wmb()
#endif
......@@ -70,7 +70,8 @@ build-stamp: check-stamp $(BUILDDIR)/COPYING
for p in $(wildcard $(TOPDIR)/debian/patches/*.patch ); do \
echo "# applying patch $$p"; \
cd $(BUILDDIR) && patch -p1 < $$p && \
echo "# OK"; \
echo "# OK" && \
cd $(TOPDIR); \
done
# build
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment