powerpc: clean up bug.h further

This simplifies the macros which are different between 32-bit and
64-bit.  It also fixes a couple of printks on the bug->line element,
which is now a long.

Signed-off-by: Paul Mackerras <paulus@samba.org>

2 files changed, 16 insertions, 18 deletions

diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index bb0d00284a7e..07e5ee40b870 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -749,22 +749,22 @@ static int check_bug_trap(struct pt_regs *regs)
         if (bug->line & BUG_WARNING_TRAP) {
                 /* this is a WARN_ON rather than BUG/BUG_ON */
 #ifdef CONFIG_XMON
-                xmon_printf(KERN_ERR "Badness in %s at %s:%d\n",
+                xmon_printf(KERN_ERR "Badness in %s at %s:%ld\n",
                        bug->function, bug->file,
                        bug->line & ~BUG_WARNING_TRAP);
 #endif /* CONFIG_XMON */                
-                printk(KERN_ERR "Badness in %s at %s:%d\n",
+                printk(KERN_ERR "Badness in %s at %s:%ld\n",
                        bug->function, bug->file,
                        bug->line & ~BUG_WARNING_TRAP);
                 dump_stack();
                 return 1;
         }
 #ifdef CONFIG_XMON
-        xmon_printf(KERN_CRIT "kernel BUG in %s at %s:%d!\n",
+        xmon_printf(KERN_CRIT "kernel BUG in %s at %s:%ld!\n",
                bug->function, bug->file, bug->line);
         xmon(regs);
 #endif /* CONFIG_XMON */
-        printk(KERN_CRIT "kernel BUG in %s at %s:%d!\n",
+        printk(KERN_CRIT "kernel BUG in %s at %s:%ld!\n",
                bug->function, bug->file, bug->line);
 
         return 0;
diff --git a/include/asm-powerpc/bug.h b/include/asm-powerpc/bug.h
index f49f46271ba6..d625ee55f957 100644
--- a/include/asm-powerpc/bug.h
+++ b/include/asm-powerpc/bug.h
@@ -12,13 +12,11 @@
 #ifndef __ASSEMBLY__
 
 #ifdef __powerpc64__
-#define BUG_TABLE_ENTRY(label, line, file, func) \
-        ".llong " #label ", " #line ", " #file ", " #func "\n"
-#define TRAP_OP(ra, rb) "1: tdnei " #ra ", " #rb "\n"
+#define BUG_TABLE_ENTRY         ".llong"
+#define BUG_TRAP_OP             "tdnei"
 #else 
-#define BUG_TABLE_ENTRY(label, line, file, func) \
-        ".long " #label ", " #line ", " #file ", " #func "\n"
-#define TRAP_OP(ra, rb) "1: twnei " #ra ", " #rb "\n"
+#define BUG_TABLE_ENTRY         ".long"
+#define BUG_TRAP_OP             "twnei"
 #endif /* __powerpc64__ */
 
 struct bug_entry {
@@ -41,17 +39,17 @@ struct bug_entry *find_bug(unsigned long bugaddr);
 #define BUG() do {                                                       \
         __asm__ __volatile__(                                            \
                 "1:     twi 31,0,0\n"                                    \
-                ".section __bug_table,\"a\"\n\t"                         \
-                BUG_TABLE_ENTRY(1b,%0,%1,%2)                             \
+                ".section __bug_table,\"a\"\n"                           \
+                "\t"BUG_TABLE_ENTRY"    1b,%0,%1,%2\n"                   \
                 ".previous"                                              \
                 : : "i" (__LINE__), "i" (__FILE__), "i" (__FUNCTION__)); \
 } while (0)
 
 #define BUG_ON(x) do {                                          \
         __asm__ __volatile__(                                   \
-                TRAP_OP(%0,0)                                   \
-                ".section __bug_table,\"a\"\n\t"                \
-                BUG_TABLE_ENTRY(1b,%1,%2,%3)                    \
+                "1:     "BUG_TRAP_OP"   %0,0\n"                 \
+                ".section __bug_table,\"a\"\n"                  \
+                "\t"BUG_TABLE_ENTRY"    1b,%1,%2,%3\n"          \
                 ".previous"                                     \
                 : : "r" ((long)(x)), "i" (__LINE__),            \
                     "i" (__FILE__), "i" (__FUNCTION__));        \
@@ -59,9 +57,9 @@ struct bug_entry *find_bug(unsigned long bugaddr);
 
 #define WARN_ON(x) do {                                         \
         __asm__ __volatile__(                                   \
-                TRAP_OP(%0,0)                                   \
-                ".section __bug_table,\"a\"\n\t"                \
-                BUG_TABLE_ENTRY(1b,%1,%2,%3)                    \
+                "1:     "BUG_TRAP_OP"   %0,0\n"                 \
+                ".section __bug_table,\"a\"\n"                  \
+                "\t"BUG_TABLE_ENTRY"    1b,%1,%2,%3\n"          \
                 ".previous"                                     \
                 : : "r" ((long)(x)),                            \
                     "i" (__LINE__ + BUG_WARNING_TRAP),          \