vserver 1.9.3

[linux-2.6.git] / arch / alpha / kernel / traps.c

diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c
index 2248735..fd7bd17 100644 (file)
--- a/arch/alpha/kernel/traps.c
+++ b/arch/alpha/kernel/traps.c
@@ -65,6 +65,8 @@ dik_show_regs(struct pt_regs *regs, unsigned long *r9_15)
 {
        printk("pc = [<%016lx>]  ra = [<%016lx>]  ps = %04lx    %s\n",
               regs->pc, regs->r26, regs->ps, print_tainted());
+       print_symbol("pc is at %s\n", regs->pc);
+       print_symbol("ra is at %s\n", regs->r26 );
        printk("v0 = %016lx  t0 = %016lx  t1 = %016lx\n",
               regs->r0, regs->r1, regs->r2);
        printk("t2 = %016lx  t3 = %016lx  t4 = %016lx\n",
@@ -109,7 +111,7 @@ dik_show_code(unsigned int *pc)
        printk("Code:");
        for (i = -6; i < 2; i++) {
                unsigned int insn;
-               if (__get_user(insn, pc+i))
+               if (__get_user(insn, (unsigned int __user *)pc + i))
                        break;
                printk("%c%08x%c", i ? ' ' : '<', insn, i ? ' ' : '>');
        }