diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2006-02-14 16:39:22 -0800 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-03-20 01:12:56 -0800 |
| commit | 9f8a5b843fc47ea150525f912574677483e1a5ac (patch) | |
| tree | e065d4ad571dccbb2f16ef08a8ea8e5942abdbb7 /arch/sparc64/kernel | |
| parent | fbf1c68eaf8a945c8617e355d8d6bd2fa09109d2 (diff) | |
| download | blackbird-op-linux-9f8a5b843fc47ea150525f912574677483e1a5ac.tar.gz blackbird-op-linux-9f8a5b843fc47ea150525f912574677483e1a5ac.zip | |
[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/sparc64/kernel')
| -rw-r--r-- | arch/sparc64/kernel/sun4v_tlb_miss.S | 2 | ||||
| -rw-r--r-- | arch/sparc64/kernel/traps.c | 2 |
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: 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 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 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; |
