Merge branch 'dev' into kernel

Conflicts:
	src/modules/kprobe/arch/asm-arm/dbi_kprobes.c

diff --cc kprobe/arch/asm-arm/dbi_kprobes.c
index 2c581e0,8544cee..655cdd9
--- 1/kprobe/arch/asm-arm/dbi_kprobes.c
--- 2/kprobe/arch/asm-arm/dbi_kprobes.c
+++ b/kprobe/arch/asm-arm/dbi_kprobes.c
@@@ -553,11 -1632,13 +553,12 @@@ int arch_init_kprobes(void
        return ret;
  }
  
 -void __exit dbi_arch_exit_kprobes (void)
 +void arch_exit_kprobes(void)
  {
 -      undo_kpro(&undef_ho_u_t);
 -      undo_kpro(&undef_ho_u);
 -      undo_kpro(&undef_ho_k);
+       dbi_unregister_kprobe(&trampoline_p, NULL);
 +      swap_unregister_undef_hook(&undef_ho_k);
  }
  
 -//EXPORT_SYMBOL_GPL (dbi_arch_uprobe_return);
 -//EXPORT_SYMBOL_GPL (dbi_arch_exit_kprobes);
 +/* export symbol for trampoline_arm.h */
 +EXPORT_SYMBOL_GPL(gen_insn_execbuf);
 +EXPORT_SYMBOL_GPL(pc_dep_insn_execbuf);