[PATCH] powerpc: Merge bug.h

ppc32/ppc64: Merge bug.h into include/asm-powerpc

This patch merges bug.h into include/asm-powerpc.  Changed the data
structure for bug_entry such that line is always an int on both 32 and
64-bit platforms; removed casts to int from the 64-bit trap code to
reflect this.

Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Becky Bruce <Becky.Bruce@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/ppc64/kernel/traps.c b/arch/ppc64/kernel/traps.c
index 7467ae508e6e..5c4647b2c5f3 100644
--- a/arch/ppc64/kernel/traps.c
+++ b/arch/ppc64/kernel/traps.c
@@ -390,12 +390,12 @@ check_bug_trap(struct pt_regs *regs)
                 /* this is a WARN_ON rather than BUG/BUG_ON */
                 printk(KERN_ERR "Badness in %s at %s:%d\n",
                        bug->function, bug->file,
-                      (unsigned int)bug->line & ~BUG_WARNING_TRAP);
+                       bug->line & ~BUG_WARNING_TRAP);
                 show_stack(current, (void *)regs->gpr[1]);
                 return 1;
         }
         printk(KERN_CRIT "kernel BUG in %s at %s:%d!\n",
-               bug->function, bug->file, (unsigned int)bug->line);
+               bug->function, bug->file, bug->line);
         return 0;
 }