aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2006-02-14 19:39:22 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-03-20 04:12:56 -0500
commit9f8a5b843fc47ea150525f912574677483e1a5ac (patch)
treee065d4ad571dccbb2f16ef08a8ea8e5942abdbb7 /arch
parentfbf1c68eaf8a945c8617e355d8d6bd2fa09109d2 (diff)
[SPARC64]: Fix C-function name called by sun4v_mna trap code.
The trap code was calling itself :-) Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/sparc64/kernel/sun4v_tlb_miss.S2
-rw-r--r--arch/sparc64/kernel/traps.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/sun4v_tlb_miss.S b/arch/sparc64/kernel/sun4v_tlb_miss.S
index 950ca74b4a58..b3844ee3844a 100644
--- a/arch/sparc64/kernel/sun4v_tlb_miss.S
+++ b/arch/sparc64/kernel/sun4v_tlb_miss.S
@@ -265,7 +265,7 @@ sun4v_mna:
265 rd %pc, %g7 265 rd %pc, %g7
266 mov %l4, %o1 266 mov %l4, %o1
267 mov %l5, %o2 267 mov %l5, %o2
268 call sun4v_mna 268 call sun4v_do_mna
269 add %sp, PTREGS_OFF, %o0 269 add %sp, PTREGS_OFF, %o0
270 ba,a,pt %xcc, rtrap_clr_l6 270 ba,a,pt %xcc, rtrap_clr_l6
271 271
diff --git a/arch/sparc64/kernel/traps.c b/arch/sparc64/kernel/traps.c
index 1e9a4b6b1fec..bedb2f693c76 100644
--- a/arch/sparc64/kernel/traps.c
+++ b/arch/sparc64/kernel/traps.c
@@ -2250,7 +2250,7 @@ void mem_address_unaligned(struct pt_regs *regs, unsigned long sfar, unsigned lo
2250 force_sig_info(SIGBUS, &info, current); 2250 force_sig_info(SIGBUS, &info, current);
2251} 2251}
2252 2252
2253void sun4v_mna(struct pt_regs *regs, unsigned long addr, unsigned long type_ctx) 2253void sun4v_do_mna(struct pt_regs *regs, unsigned long addr, unsigned long type_ctx)
2254{ 2254{
2255 siginfo_t info; 2255 siginfo_t info;
2256 2256