Commit 7f37c38c authored by Bas Zoetekouw's avatar Bas Zoetekouw Committed by Dmitry Smirnov

Imported Debian snapshot 0~git-20061221162513-3

parent e67b7f42
blktrace (0~git-20061221162513-3) experimental; urgency=low
* New fix for the store_barier() issue; we are now using our own header with
just the wmb() macros copied from the kernel source.
Thanks to p2-mate and pbrook for helping me fix this!
(closes: #406004, #406821)
* Fixed bashism in debian/rules
-- Bas Zoetekouw <bas@debian.org> Mon, 29 Jan 2007 22:08:53 +0100
blktrace (0~git-20061221162513-2) experimental; urgency=low
* Fixed a typo in the description (Thanks to Loïc for noticing!)
......
--- 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
--- blktrace-0~git-20061221162513/barrier.h.eerst 2007-01-29 22:38:43.000000000 +0100
+++ blktrace-0~git-20061221162513/barrier.h 2007-01-29 22:43:15.000000000 +0100
@@ -2,17 +2,32 @@
#define BARRIER_H
-#if defined(__ia64__)
#if defined(__ia64__)
-#define store_barrier() asm volatile ("mf" ::: "memory")
-#elif defined(__x86_64__)
+ #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("sfence" ::: "memory")
#elif defined(__i386__)
-#define store_barrier() asm volatile ("": : :"memory")
-#elif defined(__ppc__) || defined(__powerpc__)
+ #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 ("eieio" : : : "memory")
#elif defined(__s390__) || defined(__s390x__)
-#define store_barrier() asm volatile ("bcr 15,0" : : : "memory")
-#else
+ #define store_barrier() asm volatile ("bcr 15,0" : : : "memory")
+#elif defined(__alpha__)
+ #define store_barrier() asm volatile("wmb": : :"memory")
+#elif defined(__hppa__)
+ #define store_barrier() asm volatile("":::"memory")
+#elif defined(__sparc__)
+ #define store_barrier() asm volatile("":::"memory")
+#elif defined(__m68000__)
+ #define store_barrier() asm volatile("":::"memory")
+#elif defined(__mips__) /* also mipsel */
+ #define store_barrier() do { } while(0)
+#elif defined(__arm__)
+ /* taken from linux/arch/arm/kernel/entry-armv.S, thanks to pbrook! */
+ typedef void (__kernel_dmb_t)(void);
+ #define __kernel_dmb (*(__kernel_dmb_t *)0xffff0fa0)
+ #define store_barrier() __kernel_dmb()
#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()
+ #error Define store_barrier() for your CPU
#endif
#endif
......@@ -119,7 +119,10 @@ binary-arch: build install
dh_installchangelogs
dh_installdocs
dh_installmenu
dh_installman debian/{blkparse.1,blktrace.8,btrace.8,blkrawverify.1,verify_blkparse.1,btt.1}
for i in blkparse.1 blktrace.8 btrace.8 blkrawverify.1 \
verify_blkparse.1 btt.1; do \
dh_installman debian/$$i; \
done
dh_link
dh_strip
dh_compress
......
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