diff options
Diffstat (limited to 'include/asm-arm')
| -rw-r--r-- | include/asm-arm/bug.h | 20 | ||||
| -rw-r--r-- | include/asm-arm/page.h | 15 |
2 files changed, 20 insertions, 15 deletions
diff --git a/include/asm-arm/bug.h b/include/asm-arm/bug.h new file mode 100644 index 000000000000..c9b6e7f6b317 --- /dev/null +++ b/include/asm-arm/bug.h @@ -0,0 +1,20 @@ +#ifndef _ASMARM_BUG_H +#define _ASMARM_BUG_H + +#include <linux/config.h> + +#ifdef CONFIG_DEBUG_BUGVERBOSE +extern volatile void __bug(const char *file, int line, void *data); + +/* give file/line information */ +#define BUG() __bug(__FILE__, __LINE__, NULL) +#define PAGE_BUG(page) __bug(__FILE__, __LINE__, page) + +#else + +/* these just cause an oops */ +#define BUG() (*(int *)0 = 0) +#define PAGE_BUG(page) (*(int *)0 = 0) + +#endif + diff --git a/include/asm-arm/page.h b/include/asm-arm/page.h index 0b1a26ed991d..ca379e1f9184 100644 --- a/include/asm-arm/page.h +++ b/include/asm-arm/page.h @@ -160,21 +160,6 @@ typedef unsigned long pgprot_t; #ifdef __KERNEL__ #ifndef __ASSEMBLY__ -#ifdef CONFIG_DEBUG_BUGVERBOSE -extern void __bug(const char *file, int line, void *data); - -/* give file/line information */ -#define BUG() __bug(__FILE__, __LINE__, NULL) -#define PAGE_BUG(page) __bug(__FILE__, __LINE__, page) - -#else - -/* these just cause an oops */ -#define BUG() (*(int *)0 = 0) -#define PAGE_BUG(page) (*(int *)0 = 0) - -#endif - /* Pure 2^n version of get_order */ static inline int get_order(unsigned long size) { |