lkml.org 
[lkml]   [2001]   [Nov]   [29]   [last100]   RSS Feed
Views: [more markup]  [less markup]  [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
DateThu, 29 Nov 2001 16:54:56 +0300
FromIvan Kokshaysky <>
Subjectnew bio: compile fix for alpha
Added BUG_ON macro, similar to x86 one;
arg 2 for blk_queue_bounce_limit() declared `long long' in blkdev.h
and `u64' in ll_rw_blk.c, which is not the same thing on alpha.
There are several compiler warnings "long long format, long arg",
caused by the same reason, but I think they could be ignored at this point.

Ivan.

--- 2.5.1p3/include/linux/blkdev.h	Wed Nov 28 16:35:34 2001
+++ linux/include/linux/blkdev.h	Wed Nov 28 18:31:32 2001
@@ -238,7 +238,7 @@ extern void blk_attempt_remerge(request_
 extern int blk_init_queue(request_queue_t *, request_fn_proc *, char *);
 extern void blk_cleanup_queue(request_queue_t *);
 extern void blk_queue_make_request(request_queue_t *, make_request_fn *);
-extern void blk_queue_bounce_limit(request_queue_t *, unsigned long long);
+extern void blk_queue_bounce_limit(request_queue_t *, u64);
 extern void blk_queue_max_sectors(request_queue_t *q, unsigned short);
 extern void blk_queue_max_segments(request_queue_t *q, unsigned short);
 extern void blk_queue_max_segment_size(request_queue_t *q, unsigned int);
--- 2.5.1p3/include/asm-alpha/page.h	Wed Nov 28 16:34:32 2001
+++ linux/include/asm-alpha/page.h	Wed Nov 28 18:30:31 2001
@@ -64,7 +64,14 @@ do {										\
 	printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__);			\
 	__asm__ __volatile__("call_pal %0  # bugchk" : : "i" (PAL_bugchk));	\
 } while (0)
+
 #define PAGE_BUG(page)	BUG()
+
+#define BUG_ON(condition)			\
+	do {					\
+		if (unlikely((long)(condition)))\
+			BUG();			\
+	} while (0)
 
 /* Pure 2^n version of get_order */
 extern __inline__ int get_order(unsigned long size)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-03-22 12:13    [W:2.421 / U:0.000 seconds]
©2003-2008 Jasper Spaans