summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2003-01-15 15:22:28 +1100
committerAnton Blanchard <anton@samba.org>2003-01-15 15:22:28 +1100
commit5c427819def617a72c556a7cf2776a4bf28634b3 (patch)
tree2ec29076999531fb7a7d1197318fbd3fdb1e0dd5 /include
parent1b46b7b84b9c7f3ee7b6defb72976f620c808af3 (diff)
pp64: move BUG into asm/bug.h
Diffstat (limited to 'include')
-rw-r--r--include/asm-ppc64/bug.h22
-rw-r--r--include/asm-ppc64/page.h16
2 files changed, 22 insertions, 16 deletions
diff --git a/include/asm-ppc64/bug.h b/include/asm-ppc64/bug.h
new file mode 100644
index 000000000000..ccffe11f3ea3
--- /dev/null
+++ b/include/asm-ppc64/bug.h
@@ -0,0 +1,22 @@
+#ifndef _PPC64_BUG_H
+#define _PPC64_BUG_H
+
+#include <linux/config.h>
+
+#ifdef CONFIG_XMON
+struct pt_regs;
+extern void xmon(struct pt_regs *excp);
+#define BUG() do { \
+ printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
+ xmon(0); \
+} while (0)
+#else
+#define BUG() do { \
+ printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
+ __asm__ __volatile__(".long " BUG_ILLEGAL_INSTR); \
+} while (0)
+#endif
+
+#define PAGE_BUG(page) do { BUG(); } while (0)
+
+#endif
diff --git a/include/asm-ppc64/page.h b/include/asm-ppc64/page.h
index feabff500b6c..33a1c867e789 100644
--- a/include/asm-ppc64/page.h
+++ b/include/asm-ppc64/page.h
@@ -103,22 +103,6 @@ typedef unsigned long pgprot_t;
#endif
-#ifdef CONFIG_XMON
-#include <asm/ptrace.h>
-extern void xmon(struct pt_regs *excp);
-#define BUG() do { \
- printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
- xmon(0); \
-} while (0)
-#else
-#define BUG() do { \
- printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
- __asm__ __volatile__(".long " BUG_ILLEGAL_INSTR); \
-} while (0)
-#endif
-
-#define PAGE_BUG(page) do { BUG(); } while (0)
-
/* Pure 2^n version of get_order */
static inline int get_order(unsigned long size)
{