Merge /spare/repo/linux-2.6/

1 files changed, 5 insertions, 3 deletions

diff --git a/arch/sparc64/mm/fault.c b/arch/sparc64/mm/fault.c
index 52e9375288a9..db1e3310e907 100644
--- a/arch/sparc64/mm/fault.c
+++ b/arch/sparc64/mm/fault.c
@@ -18,6 +18,7 @@
 #include <linux/smp_lock.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/kprobes.h>
 
 #include <asm/page.h>
 #include <asm/pgtable.h>
@@ -117,8 +118,9 @@ unsigned long __init prom_probe_memory (void)
         return tally;
 }
 
-static void unhandled_fault(unsigned long address, struct task_struct *tsk,
-                            struct pt_regs *regs)
+static void __kprobes unhandled_fault(unsigned long address,
+                                      struct task_struct *tsk,
+                                      struct pt_regs *regs)
 {
         if ((unsigned long) address < PAGE_SIZE) {
                 printk(KERN_ALERT "Unable to handle kernel NULL "
@@ -304,7 +306,7 @@ cannot_handle:
         unhandled_fault (address, current, regs);
 }
 
-asmlinkage void do_sparc64_fault(struct pt_regs *regs)
+asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
 {
         struct mm_struct *mm = current->mm;
         struct vm_area_struct *vma;