powerpc: clean up after powermac build merge

[karo-tx-linux.git] / arch / ppc64 / kernel / traps.c

diff --git a/arch/ppc64/kernel/traps.c b/arch/ppc64/kernel/traps.c
index 7467ae508e6e27e734c1fc9110c2f03e60790900..a728c9f0b53fedde54ae54fadd6f932ae3b272d6 100644 (file)
--- a/arch/ppc64/kernel/traps.c
+++ b/arch/ppc64/kernel/traps.c
@@ -62,7 +62,7 @@ EXPORT_SYMBOL(__debugger_dabr_match);
 EXPORT_SYMBOL(__debugger_fault_handler);
 #endif
 
-struct notifier_block *ppc64_die_chain;
+struct notifier_block *powerpc_die_chain;
 static DEFINE_SPINLOCK(die_notifier_lock);
 
 int register_die_notifier(struct notifier_block *nb)
@@ -71,7 +71,7 @@ int register_die_notifier(struct notifier_block *nb)
        unsigned long flags;
 
        spin_lock_irqsave(&die_notifier_lock, flags);
-       err = notifier_chain_register(&ppc64_die_chain, nb);
+       err = notifier_chain_register(&powerpc_die_chain, nb);
        spin_unlock_irqrestore(&die_notifier_lock, flags);
        return err;
 }
@@ -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;
 }