[SPARC64]: Fix C-function name called by sun4v_mna trap code.
authorDavid S. Miller <davem@sunset.davemloft.net>
Wed, 15 Feb 2006 00:39:22 +0000 (16:39 -0800)
committerDavid S. Miller <davem@sunset.davemloft.net>
Mon, 20 Mar 2006 09:12:56 +0000 (01:12 -0800)
The trap code was calling itself :-)

Signed-off-by: David S. Miller <davem@davemloft.net>
arch/sparc64/kernel/sun4v_tlb_miss.S
arch/sparc64/kernel/traps.c

index 950ca74b4a58adb6003038e8da610914dd97cafa..b3844ee3844af7468d86ca5aa708344bd8e83d90 100644 (file)
@@ -265,7 +265,7 @@ sun4v_mna:
         rd     %pc, %g7
        mov     %l4, %o1
        mov     %l5, %o2
-       call    sun4v_mna
+       call    sun4v_do_mna
         add    %sp, PTREGS_OFF, %o0
        ba,a,pt %xcc, rtrap_clr_l6
 
index 1e9a4b6b1fecc72479fc0fb6e3bce83b73ef1b42..bedb2f693c76805bd178feceb1e36c459ffd5bbb 100644 (file)
@@ -2250,7 +2250,7 @@ void mem_address_unaligned(struct pt_regs *regs, unsigned long sfar, unsigned lo
        force_sig_info(SIGBUS, &info, current);
 }
 
-void sun4v_mna(struct pt_regs *regs, unsigned long addr, unsigned long type_ctx)
+void sun4v_do_mna(struct pt_regs *regs, unsigned long addr, unsigned long type_ctx)
 {
        siginfo_t info;