summaryrefslogtreecommitdiffstats
path: root/arch/ia64/mm/fault.c
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-03-06 18:49:01 +0100
committerTony Luck <tony.luck@intel.com>2008-03-06 18:49:01 +0100
commit45e18c228e131592a922859e1525770a1803191d (patch)
treea971746de55c007d222ef2f7834045261240fffb /arch/ia64/mm/fault.c
parent[IA64] update efi region debugging to use MB, GB and TB as well as KB (diff)
downloadlinux-45e18c228e131592a922859e1525770a1803191d.tar.xz
linux-45e18c228e131592a922859e1525770a1803191d.zip
[IA64] kprobes arch consolidation build fix
ia64 named their handler kprobes_fault_handler while all other arches used kprobe_fault_handler. Change the function definition and header declaration. Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/mm/fault.c')
-rw-r--r--arch/ia64/mm/fault.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
index 3e69881648a3..23088bed111e 100644
--- a/arch/ia64/mm/fault.c
+++ b/arch/ia64/mm/fault.c
@@ -26,7 +26,7 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
if (!user_mode(regs)) {
/* kprobe_running() needs smp_processor_id() */
preempt_disable();
- if (kprobe_running() && kprobes_fault_handler(regs, trap))
+ if (kprobe_running() && kprobe_fault_handler(regs, trap))
ret = 1;
preempt_enable();
}