diff options
Diffstat (limited to 'arch/sparc64/mm')
-rw-r--r-- | arch/sparc64/mm/fault.c | 5 | ||||
-rw-r--r-- | arch/sparc64/mm/tsb.c | 6 | ||||
-rw-r--r-- | arch/sparc64/mm/ultra.S | 5 |
3 files changed, 7 insertions, 9 deletions
diff --git a/arch/sparc64/mm/fault.c b/arch/sparc64/mm/fault.c index 236f4d228d2b..ea7d7ae76bc2 100644 --- a/arch/sparc64/mm/fault.c +++ b/arch/sparc64/mm/fault.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * arch/sparc64/mm/fault.c: Page fault handlers for the 64-bit Sparc. | 2 | * arch/sparc64/mm/fault.c: Page fault handlers for the 64-bit Sparc. |
3 | * | 3 | * |
4 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1996, 2008 David S. Miller (davem@davemloft.net) |
5 | * Copyright (C) 1997, 1999 Jakub Jelinek (jj@ultra.linux.cz) | 5 | * Copyright (C) 1997, 1999 Jakub Jelinek (jj@ultra.linux.cz) |
6 | */ | 6 | */ |
7 | 7 | ||
@@ -18,7 +18,6 @@ | |||
18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
19 | #include <linux/interrupt.h> | 19 | #include <linux/interrupt.h> |
20 | #include <linux/kprobes.h> | 20 | #include <linux/kprobes.h> |
21 | #include <linux/kallsyms.h> | ||
22 | #include <linux/kdebug.h> | 21 | #include <linux/kdebug.h> |
23 | 22 | ||
24 | #include <asm/page.h> | 23 | #include <asm/page.h> |
@@ -115,7 +114,7 @@ static void bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr) | |||
115 | printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n", | 114 | printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n", |
116 | regs->tpc); | 115 | regs->tpc); |
117 | printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]); | 116 | printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]); |
118 | print_symbol("RPC: <%s>\n", regs->u_regs[15]); | 117 | printk("OOPS: RPC <%pS>\n", (void *) regs->u_regs[15]); |
119 | printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr); | 118 | printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr); |
120 | dump_stack(); | 119 | dump_stack(); |
121 | unhandled_fault(regs->tpc, current, regs); | 120 | unhandled_fault(regs->tpc, current, regs); |
diff --git a/arch/sparc64/mm/tsb.c b/arch/sparc64/mm/tsb.c index fe70c8a557b5..3547937b17a2 100644 --- a/arch/sparc64/mm/tsb.c +++ b/arch/sparc64/mm/tsb.c | |||
@@ -96,12 +96,6 @@ void flush_tsb_user(struct mmu_gather *mp) | |||
96 | #elif defined(CONFIG_SPARC64_PAGE_SIZE_64KB) | 96 | #elif defined(CONFIG_SPARC64_PAGE_SIZE_64KB) |
97 | #define HV_PGSZ_IDX_BASE HV_PGSZ_IDX_64K | 97 | #define HV_PGSZ_IDX_BASE HV_PGSZ_IDX_64K |
98 | #define HV_PGSZ_MASK_BASE HV_PGSZ_MASK_64K | 98 | #define HV_PGSZ_MASK_BASE HV_PGSZ_MASK_64K |
99 | #elif defined(CONFIG_SPARC64_PAGE_SIZE_512KB) | ||
100 | #define HV_PGSZ_IDX_BASE HV_PGSZ_IDX_512K | ||
101 | #define HV_PGSZ_MASK_BASE HV_PGSZ_MASK_512K | ||
102 | #elif defined(CONFIG_SPARC64_PAGE_SIZE_4MB) | ||
103 | #define HV_PGSZ_IDX_BASE HV_PGSZ_IDX_4MB | ||
104 | #define HV_PGSZ_MASK_BASE HV_PGSZ_MASK_4MB | ||
105 | #else | 99 | #else |
106 | #error Broken base page size setting... | 100 | #error Broken base page size setting... |
107 | #endif | 101 | #endif |
diff --git a/arch/sparc64/mm/ultra.S b/arch/sparc64/mm/ultra.S index 9bb2d90a9df6..4c8ca131ffaf 100644 --- a/arch/sparc64/mm/ultra.S +++ b/arch/sparc64/mm/ultra.S | |||
@@ -688,6 +688,11 @@ xcall_call_function: | |||
688 | wr %g0, (1 << PIL_SMP_CALL_FUNC), %set_softint | 688 | wr %g0, (1 << PIL_SMP_CALL_FUNC), %set_softint |
689 | retry | 689 | retry |
690 | 690 | ||
691 | .globl xcall_call_function_single | ||
692 | xcall_call_function_single: | ||
693 | wr %g0, (1 << PIL_SMP_CALL_FUNC_SNGL), %set_softint | ||
694 | retry | ||
695 | |||
691 | .globl xcall_receive_signal | 696 | .globl xcall_receive_signal |
692 | xcall_receive_signal: | 697 | xcall_receive_signal: |
693 | wr %g0, (1 << PIL_SMP_RECEIVE_SIGNAL), %set_softint | 698 | wr %g0, (1 << PIL_SMP_RECEIVE_SIGNAL), %set_softint |