sparc64: Initialize FHC/CLOCK LED platform_device 'id' field correctly.

[mv-sheeva.git] / arch / sparc / kernel / traps_32.c

diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
index 716f3946c494de35d74bf74c567c4fc5f7ee79fc..358283341b4792945036fed4e32822733dd25227 100644 (file)
--- a/arch/sparc/kernel/traps_32.c
+++ b/arch/sparc/kernel/traps_32.c
@@ -67,7 +67,7 @@ void die_if_kernel(char *str, struct pt_regs *regs)
        __RESTORE; __RESTORE; __RESTORE; __RESTORE;
 
        {
-               struct reg_window *rw = (struct reg_window *)regs->u_regs[UREG_FP];
+               struct reg_window32 *rw = (struct reg_window32 *)regs->u_regs[UREG_FP];
 
                /* Stop the back trace when we hit userland or we
                 * find some badly aligned kernel stack. Set an upper
@@ -79,7 +79,7 @@ void die_if_kernel(char *str, struct pt_regs *regs)
                      !(((unsigned long) rw) & 0x7)) {
                        printk("Caller[%08lx]: %pS\n", rw->ins[7],
                               (void *) rw->ins[7]);
-                       rw = (struct reg_window *)rw->ins[6];
+                       rw = (struct reg_window32 *)rw->ins[6];
                }
        }
        printk("Instruction DUMP:");
@@ -424,6 +424,7 @@ void do_BUG(const char *file, int line)
         // bust_spinlocks(1);   XXX Not in our original BUG()
         printk("kernel BUG at %s:%d!\n", file, line);
 }
+EXPORT_SYMBOL(do_BUG);
 #endif
 
 /* Since we have our mappings set up, on multiprocessors we can spin them