diff options
author | Matt Mackall <mpm@selenic.com> | 2005-05-01 11:59:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-01 11:59:01 -0400 |
commit | cd7619d6bf36564cf54ff7218ef54e558a741913 (patch) | |
tree | c11674169b6d8f0b498e7ebe8a85d624cca82502 /include | |
parent | c8538a7aa5527d02c7191ac5da124efadf6a2827 (diff) |
[PATCH] Exterminate PAGE_BUG
Remove PAGE_BUG - repalce it with BUG and BUG_ON.
Signed-off-by: Matt Mackall <mpm@selenic.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-cris/page.h | 4 | ||||
-rw-r--r-- | include/asm-generic/bug.h | 11 | ||||
-rw-r--r-- | include/asm-sh64/bug.h | 4 |
3 files changed, 0 insertions, 19 deletions
diff --git a/include/asm-cris/page.h b/include/asm-cris/page.h index ddd8915e41e6..c767da1ef8f5 100644 --- a/include/asm-cris/page.h +++ b/include/asm-cris/page.h | |||
@@ -77,10 +77,6 @@ typedef struct { unsigned long pgprot; } pgprot_t; | |||
77 | printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \ | 77 | printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \ |
78 | } while (0) | 78 | } while (0) |
79 | 79 | ||
80 | #define PAGE_BUG(page) do { \ | ||
81 | BUG(); \ | ||
82 | } while (0) | ||
83 | |||
84 | /* Pure 2^n version of get_order */ | 80 | /* Pure 2^n version of get_order */ |
85 | static inline int get_order(unsigned long size) | 81 | static inline int get_order(unsigned long size) |
86 | { | 82 | { |
diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h index 6e5aaaa9a2fb..400c2b41896e 100644 --- a/include/asm-generic/bug.h +++ b/include/asm-generic/bug.h | |||
@@ -12,13 +12,6 @@ | |||
12 | } while (0) | 12 | } while (0) |
13 | #endif | 13 | #endif |
14 | 14 | ||
15 | #ifndef HAVE_ARCH_PAGE_BUG | ||
16 | #define PAGE_BUG(page) do { \ | ||
17 | printk("page BUG for page at %p\n", page); \ | ||
18 | BUG(); \ | ||
19 | } while (0) | ||
20 | #endif | ||
21 | |||
22 | #ifndef HAVE_ARCH_BUG_ON | 15 | #ifndef HAVE_ARCH_BUG_ON |
23 | #define BUG_ON(condition) do { if (unlikely((condition)!=0)) BUG(); } while(0) | 16 | #define BUG_ON(condition) do { if (unlikely((condition)!=0)) BUG(); } while(0) |
24 | #endif | 17 | #endif |
@@ -37,10 +30,6 @@ | |||
37 | #define BUG() | 30 | #define BUG() |
38 | #endif | 31 | #endif |
39 | 32 | ||
40 | #ifndef HAVE_ARCH_PAGE_BUG | ||
41 | #define PAGE_BUG(page) do { if (page) ; } while (0) | ||
42 | #endif | ||
43 | |||
44 | #ifndef HAVE_ARCH_BUG_ON | 33 | #ifndef HAVE_ARCH_BUG_ON |
45 | #define BUG_ON(condition) do { if (condition) ; } while(0) | 34 | #define BUG_ON(condition) do { if (condition) ; } while(0) |
46 | #endif | 35 | #endif |
diff --git a/include/asm-sh64/bug.h b/include/asm-sh64/bug.h index 3acd54d59566..5d659ec28e10 100644 --- a/include/asm-sh64/bug.h +++ b/include/asm-sh64/bug.h | |||
@@ -17,10 +17,6 @@ | |||
17 | BUG(); \ | 17 | BUG(); \ |
18 | } while(0) | 18 | } while(0) |
19 | 19 | ||
20 | #define PAGE_BUG(page) do { \ | ||
21 | BUG(); \ | ||
22 | } while (0) | ||
23 | |||
24 | #define WARN_ON(condition) do { \ | 20 | #define WARN_ON(condition) do { \ |
25 | if (unlikely((condition)!=0)) { \ | 21 | if (unlikely((condition)!=0)) { \ |
26 | printk("Badness in %s at %s:%d\n", __FUNCTION__, __FILE__, __LINE__); \ | 22 | printk("Badness in %s at %s:%d\n", __FUNCTION__, __FILE__, __LINE__); \ |