Merge commit '47da1aa59eb36b55cda9138bec39942a14f051c4' into kernel

Conflicts:
	src/modules/kprobe/arch/dbi_kprobes.c
	src/modules/kprobe/dbi_kprobes.h

diff --cc kprobe/arch/asm-x86/dbi_kprobes.c
index 9be3aff,a9d5738..aa2d62e
--- 1/kprobe/arch/asm-x86/dbi_kprobes.c
--- 2/kprobe/arch/asm-x86/dbi_kprobes.c
+++ b/kprobe/arch/asm-x86/dbi_kprobes.c
@@@ -1222,8 -1372,9 +1222,8 @@@ void arch_prepare_kretprobe(struct kret
        if ((ri = get_free_rp_inst (rp)) != NULL)
        {
                ri->rp = rp;
 -              ri->rp2 = NULL;
                ri->task = current;
-               ri->sp = (kprobe_opcode_t *)regs->EREG(sp);
+               ri->sp = &regs->EREG(sp);
  
                /* Replace the return addr with trampoline addr */
                if (rp->kp.tgid){

diff --cc kprobe/dbi_kprobes.c
Simple merge

diff --cc kprobe/dbi_kprobes.h
index c1b3d90,446ac31..17eb49c
--- 1/kprobe/dbi_kprobes.h
--- 2/kprobe/dbi_kprobes.h
+++ b/kprobe/dbi_kprobes.h
@@@ -201,10 -202,10 +201,10 @@@ struct kretprobe_instanc
        struct hlist_node uflist;
        struct hlist_node hlist;
        struct kretprobe *rp;
-       kprobe_opcode_t *ret_addr;
-       kprobe_opcode_t *sp;
+       unsigned long *ret_addr;
+       unsigned long *sp;
 -      struct kretprobe *rp2;
        struct task_struct *task;
 +      char data[0];
  };
  
  

diff --cc kprobe/dbi_kprobes_deps.c
Simple merge

diff --cc kprobe/dbi_kprobes_deps.h
Simple merge