aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-12-10 21:08:29 -0500
committerDavid S. Miller <davem@davemloft.net>2009-12-10 21:08:29 -0500
commit4ed5d5e4299f42438dd5ac6dcb1f2168ea4fb02a (patch)
treed0aaf8e21b5af3e208854b314b9b7d5ffb9432ce /arch/sparc
parent135d082171766922c6a9e2c741a326e518268428 (diff)
sparc64: Add some missing __kprobes annotations to kernel fault paths.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc')
-rw-r--r--arch/sparc/mm/fault_64.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
index 0aa50b200af8..6081936bf03b 100644
--- a/arch/sparc/mm/fault_64.c
+++ b/arch/sparc/mm/fault_64.c
@@ -31,7 +31,7 @@
31#include <asm/sections.h> 31#include <asm/sections.h>
32#include <asm/mmu_context.h> 32#include <asm/mmu_context.h>
33 33
34static inline int notify_page_fault(struct pt_regs *regs) 34static inline __kprobes int notify_page_fault(struct pt_regs *regs)
35{ 35{
36 int ret = 0; 36 int ret = 0;
37 37
@@ -66,7 +66,7 @@ static void __kprobes unhandled_fault(unsigned long address,
66 die_if_kernel("Oops", regs); 66 die_if_kernel("Oops", regs);
67} 67}
68 68
69static void bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr) 69static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
70{ 70{
71 printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n", 71 printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
72 regs->tpc); 72 regs->tpc);
@@ -163,8 +163,9 @@ static unsigned int get_fault_insn(struct pt_regs *regs, unsigned int insn)
163 return insn; 163 return insn;
164} 164}
165 165
166static void do_kernel_fault(struct pt_regs *regs, int si_code, int fault_code, 166static void __kprobes do_kernel_fault(struct pt_regs *regs, int si_code,
167 unsigned int insn, unsigned long address) 167 int fault_code, unsigned int insn,
168 unsigned long address)
168{ 169{
169 unsigned char asi = ASI_P; 170 unsigned char asi = ASI_P;
170 171
@@ -218,7 +219,7 @@ cannot_handle:
218 unhandled_fault (address, current, regs); 219 unhandled_fault (address, current, regs);
219} 220}
220 221
221static void noinline bogus_32bit_fault_tpc(struct pt_regs *regs) 222static void noinline __kprobes bogus_32bit_fault_tpc(struct pt_regs *regs)
222{ 223{
223 static int times; 224 static int times;
224 225
@@ -230,8 +231,8 @@ static void noinline bogus_32bit_fault_tpc(struct pt_regs *regs)
230 show_regs(regs); 231 show_regs(regs);
231} 232}
232 233
233static void noinline bogus_32bit_fault_address(struct pt_regs *regs, 234static void noinline __kprobes bogus_32bit_fault_address(struct pt_regs *regs,
234 unsigned long addr) 235 unsigned long addr)
235{ 236{
236 static int times; 237 static int times;
237 238