Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (30 commits)
  [S390] wire up sys_perf_counter_open
  [S390] wire up sys_rt_tgsigqueueinfo
  [S390] ftrace: add system call tracer support
  [S390] ftrace: add function graph tracer support
  [S390] ftrace: add function trace mcount test support
  [S390] ftrace: add dynamic ftrace support
  [S390] kprobes: use probe_kernel_write
  [S390] maccess: arch specific probe_kernel_write() implementation
  [S390] maccess: add weak attribute to probe_kernel_write
  [S390] profile_tick called twice
  [S390] dasd: forward internal errors to dasd_sleep_on caller
  [S390] dasd: sync after async probe
  [S390] dasd: check_characteristics cleanup
  [S390] dasd: no High Performance FICON in 31-bit mode
  [S390] dcssblk: revert devt conversion
  [S390] qdio: fix access beyond ARRAY_SIZE of irq_ptr->{in,out}put_qs
  [S390] vmalloc: add vmalloc kernel parameter support
  [S390] uaccess: use might_fault() instead of might_sleep()
  [S390] 3270: lock dependency fixes
  [S390] 3270: do not register with tty_register_device
  ...

1 files changed, 2 insertions, 29 deletions

diff --git a/arch/s390/kernel/kprobes.c b/arch/s390/kernel/kprobes.c
index a01cf0284db2..9bb2f6241d9f 100644
--- a/arch/s390/kernel/kprobes.c
+++ b/arch/s390/kernel/kprobes.c
@@ -25,9 +25,9 @@
 #include <linux/preempt.h>
 #include <linux/stop_machine.h>
 #include <linux/kdebug.h>
+#include <linux/uaccess.h>
 #include <asm/cacheflush.h>
 #include <asm/sections.h>
-#include <asm/uaccess.h>
 #include <linux/module.h>
 
 DEFINE_PER_CPU(struct kprobe *, current_kprobe) = NULL;
@@ -155,35 +155,8 @@ void __kprobes get_instruction_type(struct arch_specific_insn *ainsn)
 static int __kprobes swap_instruction(void *aref)
 {
         struct ins_replace_args *args = aref;
-        u32 *addr;
-        u32 instr;
-        int err = -EFAULT;
 
-        /*
-         * Text segment is read-only, hence we use stura to bypass dynamic
-         * address translation to exchange the instruction. Since stura
-         * always operates on four bytes, but we only want to exchange two
-         * bytes do some calculations to get things right. In addition we
-         * shall not cross any page boundaries (vmalloc area!) when writing
-         * the new instruction.
-         */
-        addr = (u32 *)((unsigned long)args->ptr & -4UL);
-        if ((unsigned long)args->ptr & 2)
-                instr = ((*addr) & 0xffff0000) | args->new;
-        else
-                instr = ((*addr) & 0x0000ffff) | args->new << 16;
-
-        asm volatile(
-                "       lra     %1,0(%1)\n"
-                "0:     stura   %2,%1\n"
-                "1:     la      %0,0\n"
-                "2:\n"
-                EX_TABLE(0b,2b)
-                : "+d" (err)
-                : "a" (addr), "d" (instr)
-                : "memory", "cc");
-
-        return err;
+        return probe_kernel_write(args->ptr, &args->new, sizeof(args->new));
 }
 
 void __kprobes arch_arm_kprobe(struct kprobe *p)