Merge branch 'dev' into kernel

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

diff --cc driver/Makefile.am
index b7217c8,111eb14..86c0089
--- 1/driver/Makefile.am
--- 2/driver/Makefile.am
+++ b/driver/Makefile.am
@@@ -46,9 -52,11 +46,10 @@@ install-exec-local
  
        install -m 644 $(driver_module_dir)/$(module_name).ko $(prefix)
        install -m 644 $(driver_module_dir)/$(module_name).ko.addr $(prefix)
-       install -m 755 $(driver_module_dir)/patchko.sh $(prefix)/bin
-       install -m 755 $(driver_module_dir)/insmod.sh $(prefix)/bin
+       mkdir -p $(prefix)/bin/
+       install -m 755 $(driver_module_dir)/patchko.sh $(prefix)/bin/
+       install -m 755 $(driver_module_dir)/insmod.sh $(prefix)/bin/
  
 -      if [ "$(android)" != "yes" ] ; then \
        sed "s|__DEV_NAME__|`basename $(dev_path)`|" $(driver_module_dir)/$(module_name).sh | \
        sed "s|__DEV_DIR__|`dirname $(dev_path)`|" > \
        $(prefix)/$(module_name).sh ; chmod +x $(prefix)/$(module_name).sh ; \

diff --cc kprobe/dbi_kprobes.c
index bbd0a89,c0519f2..817cac5
--- 1/kprobe/dbi_kprobes.c
--- 2/kprobe/dbi_kprobes.c
+++ b/kprobe/dbi_kprobes.c
@@@ -974,27 -909,7 +977,35 @@@ int patch_suspended_task(struct kretpro
        return 0;
  }
  
 -static int __init init_kprobes (void)
 +static int init_module_deps(void)
 +{
 +      int ret;
 +
 +      sched_addr = swap_ksyms("__switch_to");
 +      fork_addr = swap_ksyms("do_fork");
 +      exit_addr = swap_ksyms("do_exit");
- 
-       if (sched_addr == 0 || fork_addr == 0 || exit_addr == 0) {
++      sys_exit_group_addr = swap_ksyms("sys_exit_group");
++        do_group_exit_addr = swap_ksyms("do_group_exit");
++        sys_exit_addr = swap_ksyms("sys_exit");
++
++      if (sched_addr == 0 ||
++          fork_addr == 0 ||
++          exit_addr == 0 ||
++          sys_exit_group_addr == 0 ||
++          do_group_exit_addr == 0 ||
++          sys_exit_addr == 0) {
 +              return -ESRCH;
 +      }
 +
 +      ret = init_module_dependencies();
 +      if (ret) {
 +              return ret;
 +      }
 +
 +      return arch_init_module_deps();
 +}
 +
 +static int __init init_kprobes(void)
  {
        int i, err = 0;
  

diff --cc kprobe/dbi_kprobes_deps.c
Simple merge

diff --cc kprobe/dbi_kprobes_deps.h
Simple merge