Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 176433
b: refs/heads/master
c: 4ed5d5e
h: refs/heads/master
i:
  176431: 0ac9009
v: v3
  • Loading branch information
David S. Miller committed Dec 11, 2009
1 parent 6bf307b commit 924da31
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 135d082171766922c6a9e2c741a326e518268428
refs/heads/master: 4ed5d5e4299f42438dd5ac6dcb1f2168ea4fb02a
15 changes: 8 additions & 7 deletions trunk/arch/sparc/mm/fault_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#include <asm/sections.h>
#include <asm/mmu_context.h>

static inline int notify_page_fault(struct pt_regs *regs)
static inline __kprobes int notify_page_fault(struct pt_regs *regs)
{
int ret = 0;

Expand Down Expand Up @@ -66,7 +66,7 @@ static void __kprobes unhandled_fault(unsigned long address,
die_if_kernel("Oops", regs);
}

static void bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
{
printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
regs->tpc);
Expand Down Expand Up @@ -163,8 +163,9 @@ static unsigned int get_fault_insn(struct pt_regs *regs, unsigned int insn)
return insn;
}

static void do_kernel_fault(struct pt_regs *regs, int si_code, int fault_code,
unsigned int insn, unsigned long address)
static void __kprobes do_kernel_fault(struct pt_regs *regs, int si_code,
int fault_code, unsigned int insn,
unsigned long address)
{
unsigned char asi = ASI_P;

Expand Down Expand Up @@ -218,7 +219,7 @@ static void do_kernel_fault(struct pt_regs *regs, int si_code, int fault_code,
unhandled_fault (address, current, regs);
}

static void noinline bogus_32bit_fault_tpc(struct pt_regs *regs)
static void noinline __kprobes bogus_32bit_fault_tpc(struct pt_regs *regs)
{
static int times;

Expand All @@ -230,8 +231,8 @@ static void noinline bogus_32bit_fault_tpc(struct pt_regs *regs)
show_regs(regs);
}

static void noinline bogus_32bit_fault_address(struct pt_regs *regs,
unsigned long addr)
static void noinline __kprobes bogus_32bit_fault_address(struct pt_regs *regs,
unsigned long addr)
{
static int times;

Expand Down

0 comments on commit 924da31

Please sign in to comment.