Merge /spare/repo/linux-2.6/

3 files changed, 9 insertions, 4 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;
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c
index 3fbaf342a452..fdb1ebb308c9 100644
--- a/arch/sparc64/mm/init.c
+++ b/arch/sparc64/mm/init.c
@@ -19,6 +19,7 @@
 #include <linux/pagemap.h>
 #include <linux/fs.h>
 #include <linux/seq_file.h>
+#include <linux/kprobes.h>
 
 #include <asm/head.h>
 #include <asm/system.h>
@@ -250,7 +251,7 @@ out:
         put_cpu();
 }
 
-void flush_icache_range(unsigned long start, unsigned long end)
+void __kprobes flush_icache_range(unsigned long start, unsigned long end)
 {
         /* Cheetah has coherent I-cache. */
         if (tlb_type == spitfire) {
diff --git a/arch/sparc64/mm/ultra.S b/arch/sparc64/mm/ultra.S
index 8dfa825eca51..b2ee9b53227f 100644
--- a/arch/sparc64/mm/ultra.S
+++ b/arch/sparc64/mm/ultra.S
@@ -119,6 +119,7 @@ __spitfire_flush_tlb_mm_slow:
 #else
 #error unsupported PAGE_SIZE
 #endif
+        .section .kprobes.text, "ax"
         .align          32
         .globl          __flush_icache_page
 __flush_icache_page:    /* %o0 = phys_page */
@@ -201,6 +202,7 @@ dflush4:stxa		%g0, [%o4] ASI_DCACHE_TAG
          nop
 #endif /* DCACHE_ALIASING_POSSIBLE */
 
+        .previous .text
         .align          32
 __prefill_dtlb:
         rdpr            %pstate, %g7