BUG_ON() not arch-specific.
PATCH 1/1 BUG_ON() not arch-specific.
Hi all,
We only need one BUG_ON implementation, surely. Genericized
and moved to linux/kernel.h.
Cheers,
Rusty.
include/linux/kernel.h +1 -0
@@ -176,4 +176,5 @@ char _f[20-2*sizeof(long)-sizeof(int)]; /* Padding: libc5 uses this.. */ }; +#define BUG_ON (condition) do { if (unlikely((condition)!=0)) BUG(); } while(0)#endif
include/asm-alpha/page.h +0 -12
@@ -67,18 +67,6 @@#define PAGE_BUG (page) BUG() -#define BUG_ON (condition) \ - do { \ - if (unlikely((long)(condition)))\ - BUG(); \ - } while (0) - -#define BUG_ON (condition) \ - do { \ - if (unlikely((int)(condition))) \ - BUG(); \ - } while (0) -/* Pure 2^n version of get_order */ extern __inline__int get_order (unsigned long size) {
include/asm-i386/page.h +0 -6
@@ -101,12 +101,6 @@BUG (); \ }while (0 ) -#define BUG_ON (condition) \ - do { \ - if (unlikely((int)(condition))) \ - BUG(); \ - } while (0) -/* Pure 2^n version of get_order */ static __inline__ int get_order(unsigned long size) {
--
Premature optmztion is rt of all evl. --DK
Quoted 4 lines · Rusty Russell
Hi all,
We only need one
BUG_ONimplementation, surely. Genericized
and moved tolinux/kernel.h.
Yes, fine.
Signature · 1 line
Jens Axboe
include/linux/kernel.h line 179
Quoted 7 lines · [email protected] said:
include/linux/kernel.h +1
-0@@ -176,4 +176,5 @@char _f[20 -2 *sizeof (long )-sizeof (int )];/* Padding: libc5 uses this.. */ }; +#define BUG_ON (condition) do { if (unlikely((condition)!=0)) BUG(); } while(0)
You'll need to add #include <linux/compiler.h> to linux/kernel.h if you do that. Let's not make the include files any more broken than they already are :)
--
dwmw2
In message <[email protected]> you write:
Quoted 3 lines
You'll need to add #include <
linux/compiler.h> tolinux/kernel.hif you do that. Let's not make the include files any more broken than they already are :)
Ack. Linus, please apply.
include/linux/kernel.h +2 -0
@@ -11,6 +11,7 @@#include <linux/linkage.h> #include <linux/stddef.h> #include <linux/types.h> +#include <linux/compiler.h> /* Optimization barrier */ /* The "volatile" is due to gcc bugs */
@@ -176,4 +177,5 @@ char _f[20-2*sizeof(long)-sizeof(int)]; /* Padding: libc5 uses this.. */ }; +#define BUG_ON (condition) do { if (unlikely((condition)!=0)) BUG(); } while(0)#endif
include/asm-alpha/page.h +0 -12
@@ -67,18 +67,6 @@#define PAGE_BUG (page) BUG() -#define BUG_ON (condition) \ - do { \ - if (unlikely((long)(condition)))\ - BUG(); \ - } while (0) - -#define BUG_ON (condition) \ - do { \ - if (unlikely((int)(condition))) \ - BUG(); \ - } while (0) -/* Pure 2^n version of get_order */ extern __inline__int get_order (unsigned long size) {
include/asm-i386/page.h +0 -6
@@ -101,12 +101,6 @@BUG (); \ }while (0 ) -#define BUG_ON (condition) \ - do { \ - if (unlikely((int)(condition))) \ - BUG(); \ - } while (0) -/* Pure 2^n version of get_order */ static __inline__ int get_order(unsigned long size) {
--
Anyone who quotes me in their sig is an idiot. -- Rusty Russell.