projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge Btrfs into fs/btrfs
[linux-2.6-block.git]
/
arch
/
ia64
/
mm
/
fault.c
diff --git
a/arch/ia64/mm/fault.c
b/arch/ia64/mm/fault.c
index 3e69881648a35ea1b91536b52eeb9387de9fd8d6..23088bed111ec229c4df3b1315da0e0fce7411a3 100644
(file)
--- 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() && kprobe
s
_fault_handler(regs, trap))
+ if (kprobe_running() && kprobe_fault_handler(regs, trap))
ret = 1;
preempt_enable();
}