Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[pandora-kernel.git] / arch / s390 / include / asm / kprobes.h

diff --git a/arch/s390/include/asm/kprobes.h b/arch/s390/include/asm/kprobes.h
index 787c6a8..a231a94 100644 (file)
--- a/arch/s390/include/asm/kprobes.h
+++ b/arch/s390/include/asm/kprobes.h
@@ -31,7 +31,6 @@
 #include <linux/ptrace.h>
 #include <linux/percpu.h>
 
-#define  __ARCH_WANT_KPROBES_INSN_SLOT
 struct pt_regs;
 struct kprobe;
 
@@ -58,7 +57,7 @@ typedef u16 kprobe_opcode_t;
 /* Architecture specific copy of original instruction */
 struct arch_specific_insn {
        /* copy of original instruction */
-       kprobe_opcode_t *insn;
+       kprobe_opcode_t insn[MAX_INSN_SIZE];
 };
 
 struct prev_kprobe {
@@ -71,10 +70,8 @@ struct kprobe_ctlblk {
        unsigned long kprobe_status;
        unsigned long kprobe_saved_imask;
        unsigned long kprobe_saved_ctl[3];
-       struct pt_regs jprobe_saved_regs;
-       unsigned long jprobe_saved_r14;
-       unsigned long jprobe_saved_r15;
        struct prev_kprobe prev_kprobe;
+       struct pt_regs jprobe_saved_regs;
        kprobe_opcode_t jprobes_stack[MAX_STACK_SIZE];
 };