Merge branch 'dev' of ssh://106.109.8.71/srv/git/dbi into dev

Conflicts:
	configure.ac
	src/modules/driver/Makefile.am
	src/modules/kprobe/Makefile.am

diff --cc driver/Makefile.am
index 7643eaf,5828245..d6140d7
--- 1/driver/Makefile.am
--- 2/driver/Makefile.am
+++ b/driver/Makefile.am
@@@ -38,7 -36,7 +40,7 @@@ extra_cflags = "$(inlude_opt) -DEC_ARCH
  
  all-local:
        cp $(top_srcdir)/src/modules/kprobe/Module.symvers $(driver_module_dir)
-       $(MAKE) CROSS_COMPILE=$(cross_compiler) ARCH=$(target_arch) memchecker=$(memchecker) android_opt=$(android_opt) slp_opt=$(slp_opt) android_app_opt=$(android_app_opt) board_opt=$(board_opt) debug_opt=$(debug_opt) $(AM_MAKEFLAGS) -C $(target_kernel_src) $(sparse_output) M=$(driver_module_dir) modules
 -      $(MAKE) CROSS_COMPILE=$(cross_compiler) ARCH=$(target_arch) extra_cflags=$(extra_cflags) $(AM_MAKEFLAGS) -C $(target_kernel_src) M=$(driver_module_dir) modules
++      $(MAKE) CROSS_COMPILE=$(cross_compiler) ARCH=$(target_arch) extra_cflags=$(extra_cflags) $(AM_MAKEFLAGS) -C $(target_kernel_src) C=2 M=$(driver_module_dir) modules
  
        echo "generate data for version patching <$(OBJDUMP)><$(READELF)>"
        $(top_srcdir)/src/modules/driver/patchko.sh -g $(driver_module_dir)/$(module_name).ko $(OBJDUMP) $(READELF)

diff --cc kprobe/Makefile.am
index ec2ce69,bc703e3..2ea4325
--- 1/kprobe/Makefile.am
--- 2/kprobe/Makefile.am
+++ b/kprobe/Makefile.am
@@@ -19,7 -17,7 +21,7 @@@ extra_cflags = "$(inlude_opt) $(android
  
  all-local:
        rm -f $(top_srcdir)/src/modules/kprobe/arch/asm && $(LN_S) asm-${target_arch} $(top_srcdir)/src/modules/kprobe/arch/asm
-       $(MAKE) CROSS_COMPILE=$(cross_compiler) ARCH=$(target_arch) android_opt=$(android_opt) board_opt=$(board_opt) $(AM_MAKEFLAGS) -C $(target_kernel_src) $(sparse_output) M=$(kprobes_module_dir) modules
 -      $(MAKE) CROSS_COMPILE=$(cross_compiler) ARCH=$(target_arch) extra_cflags=$(extra_cflags) $(AM_MAKEFLAGS) -C $(target_kernel_src) M=$(kprobes_module_dir) modules
++      $(MAKE) CROSS_COMPILE=$(cross_compiler) ARCH=$(target_arch) extra_cflags=$(extra_cflags) $(AM_MAKEFLAGS) -C $(target_kernel_src) C=2 M=$(kprobes_module_dir) modules
  
  
        echo "generate data for version patching <$(OBJDUMP)><$(READELF)>"