diff options
| author | Russell King <rmk@arm.linux.org.uk> | 2003-01-12 23:24:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2003-01-12 23:24:04 -0800 |
| commit | 9e5350557e7ba76771c66155132c117a69a0508e (patch) | |
| tree | 3167c53fece393622aaa9826b06e71b4187e35c1 /include/linux/jbd.h | |
| parent | fb5805fb279e47410296f8739af1a02143f48a8a (diff) | |
[PATCH] use <asm/bug.h> for BUG() defines
This patch moves BUG() and PAGE_BUG() from asm/page.h into asm/bug.h.
We also fix up linux/dcache.h, which included asm/page.h for the sole
purpose of getting the BUG() definition.
Since linux/kernel.h and linux/smp.h make use of BUG(), asm/bug.h is
included there as well.
In addition, linux/jbd.h did not contain a clear path with which to
obtain the archtecture BUG() definition, but did contain its own
definition.
Diffstat (limited to 'include/linux/jbd.h')
| -rw-r--r-- | include/linux/jbd.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/include/linux/jbd.h b/include/linux/jbd.h index 5b1657fca68a..f3e44482a298 100644 --- a/include/linux/jbd.h +++ b/include/linux/jbd.h @@ -194,6 +194,7 @@ typedef struct journal_superblock_s #include <linux/fs.h> #include <linux/sched.h> +#include <asm/bug.h> #define JBD_ASSERTIONS #ifdef JBD_ASSERTIONS @@ -779,14 +780,6 @@ static inline void journal_abort_handle(handle_t *handle) handle->h_aborted = 1; } -/* Not all architectures define BUG() */ -#ifndef BUG - #define BUG() do { \ - printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \ - * ((char *) 0) = 0; \ - } while (0) -#endif /* BUG */ - #endif /* __KERNEL__ */ /* Comparison functions for transaction IDs: perform comparisons using |