Skip to content

Commit

Permalink
sh: Look up the trap vector for the page fault notifier.
Browse files Browse the repository at this point in the history
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Paul Mundt committed Sep 21, 2008
1 parent 4c59e29 commit 887f1ae
Showing 1 changed file with 4 additions and 9 deletions.
13 changes: 4 additions & 9 deletions arch/sh/mm/fault_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,21 @@
#include <asm/tlbflush.h>
#include <asm/kgdb.h>

#ifdef CONFIG_KPROBES
static inline int notify_page_fault(struct pt_regs *regs, int trap)
{
int ret = 0;

#ifdef CONFIG_KPROBES
if (!user_mode(regs)) {
preempt_disable();
if (kprobe_running() && kprobe_fault_handler(regs, trap))
ret = 1;
preempt_enable();
}
#endif

return ret;
}
#else
static inline int notify_page_fault(struct pt_regs *regs, int trap)
{
return 0;
}
#endif

/*
* This routine handles page faults. It determines the address,
Expand All @@ -58,7 +53,7 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,
int fault;
siginfo_t info;

if (notify_page_fault(regs, writeaccess))
if (notify_page_fault(regs, lookup_exception_vector()))
return;

#ifdef CONFIG_SH_KGDB
Expand Down Expand Up @@ -293,7 +288,7 @@ asmlinkage int __kprobes __do_page_fault(struct pt_regs *regs,
pte_t *pte;
pte_t entry;

if (notify_page_fault(regs, writeaccess))
if (notify_page_fault(regs, lookup_exception_vector()))
return 0;

#ifdef CONFIG_SH_KGDB
Expand Down

0 comments on commit 887f1ae

Please sign in to comment.