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/asm-cris | |
| 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/asm-cris')
| -rw-r--r-- | include/asm-cris/bug.h | 12 | ||||
| -rw-r--r-- | include/asm-cris/page.h | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/include/asm-cris/bug.h b/include/asm-cris/bug.h new file mode 100644 index 000000000000..64e1d8b01f25 --- /dev/null +++ b/include/asm-cris/bug.h @@ -0,0 +1,12 @@ +#ifndef _CRIS_BUG_H +#define _CRIS_BUG_H + +#define BUG() do { \ + printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \ +} while (0) + +#define PAGE_BUG(page) do { \ + BUG(); \ +} while (0) + +#endif diff --git a/include/asm-cris/page.h b/include/asm-cris/page.h index 01166c2bfd7c..47c83465c2af 100644 --- a/include/asm-cris/page.h +++ b/include/asm-cris/page.h @@ -70,18 +70,6 @@ typedef unsigned long pgprot_t; #define PAGE_OFFSET KSEG_C /* kseg_c is mapped to physical ram */ #endif -#ifndef __ASSEMBLY__ - -#define BUG() do { \ - printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \ -} while (0) - -#define PAGE_BUG(page) do { \ - BUG(); \ -} while (0) - -#endif /* __ASSEMBLY__ */ - /* macros to convert between really physical and virtual addresses * by stripping a selected bit, we can convert between KSEG_x and 0x40000000 where * the DRAM really resides |