1 files changed, 6 insertions, 5 deletions

diff --git a/include/asm-sparc64/kprobes.h b/include/asm-sparc64/kprobes.h
index c9f5c34d318c..becc38fa06c5 100644
--- a/include/asm-sparc64/kprobes.h
+++ b/include/asm-sparc64/kprobes.h
@@ -13,7 +13,11 @@ typedef u32 kprobe_opcode_t;
 #define JPROBE_ENTRY(pentry)    (kprobe_opcode_t *)pentry
 #define arch_remove_kprobe(p)   do {} while (0)
 #define  ARCH_INACTIVE_KPROBE_COUNT 0
-#define flush_insn_slot(p)      do { } while (0)
+
+#define flush_insn_slot(p)              \
+do {    flushi(&(p)->ainsn.insn[0]);    \
+        flushi(&(p)->ainsn.insn[1]);    \
+} while (0)
 
 /* Architecture specific copy of original instruction*/
 struct arch_specific_insn {
@@ -23,7 +27,7 @@ struct arch_specific_insn {
 
 struct prev_kprobe {
         struct kprobe *kp;
-        unsigned int status;
+        unsigned long status;
         unsigned long orig_tnpc;
         unsigned long orig_tstate_pil;
 };
@@ -33,10 +37,7 @@ struct kprobe_ctlblk {
         unsigned long kprobe_status;
         unsigned long kprobe_orig_tnpc;
         unsigned long kprobe_orig_tstate_pil;
-        long *jprobe_saved_esp;
         struct pt_regs jprobe_saved_regs;
-        struct pt_regs *jprobe_saved_regs_location;
-        struct sparc_stackf jprobe_saved_stack;
         struct prev_kprobe prev_kprobe;
 };