ppc64: move BUG_ILLEGAL_INSTR into asm/bug.h, noted by Milton Miller

diff --git a/include/asm-ppc64/bug.h b/include/asm-ppc64/bug.h
index ccffe11f3ea3648055a386fef749187902694b4f..9a52a5c879ba6cbf9292cb1380ba27ede774d891 100644 (file)
--- a/include/asm-ppc64/bug.h
+++ b/include/asm-ppc64/bug.h
@@ -3,6 +3,16 @@
 
 #include <linux/config.h>
 
+/*
+ * Define an illegal instr to trap on the bug.
+ * We don't use 0 because that marks the end of a function
+ * in the ELF ABI.  That's "Boo Boo" in case you wonder...
+ */
+#define BUG_OPCODE .long 0x00b00b00  /* For asm */
+#define BUG_ILLEGAL_INSTR "0x00b00b00" /* For BUG macro */
+
+#ifndef __ASSEMBLY__
+
 #ifdef CONFIG_XMON
 struct pt_regs;
 extern void xmon(struct pt_regs *excp);
@@ -20,3 +30,4 @@ extern void xmon(struct pt_regs *excp);
 #define PAGE_BUG(page) do { BUG(); } while (0)
 
 #endif
+#endif

diff --git a/include/asm-ppc64/page.h b/include/asm-ppc64/page.h
index 33a1c867e789d5d8b4caec461fa5bc98d7830bac..865f2bbdeb356e0698a4694f4ffb8901879f8ac9 100644 (file)
--- a/include/asm-ppc64/page.h
+++ b/include/asm-ppc64/page.h
@@ -22,13 +22,6 @@
 #define SID_MASK        0xfffffffff
 #define GET_ESID(x)     (((x) >> SID_SHIFT) & SID_MASK)
 
-/* Define an illegal instr to trap on the bug.
- * We don't use 0 because that marks the end of a function
- * in the ELF ABI.  That's "Boo Boo" in case you wonder...
- */
-#define BUG_OPCODE .long 0x00b00b00  /* For asm */
-#define BUG_ILLEGAL_INSTR "0x00b00b00" /* For BUG macro */
-
 #ifdef __KERNEL__
 #ifndef __ASSEMBLY__
 #include <asm/naca.h>