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

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

diff --cc driver/us_proc_inst.c
Simple merge

diff --cc driver/us_proc_inst.h
index c0e0440,059ee99..a88e552
--- 1/driver/us_proc_inst.h
--- 2/driver/us_proc_inst.h
+++ b/driver/us_proc_inst.h
@@@ -83,9 -80,14 +83,17 @@@ struct kretprobe_instance *find_ri(stru
  /* Gets current function return address */
  extern unsigned long get_ret_addr(struct task_struct *task, struct us_ip *ip);
  
 +/* Gets current function entry stack pointer */
 +extern unsigned long get_entry_sp(struct task_struct *task, struct us_ip *ip);
 +
+ extern unsigned long imi_sum_time;
+ extern unsigned long imi_sum_hit;
+ 
+ extern struct list_head proc_probes_list;
+ 
+ int register_usprobe(struct task_struct *task, struct us_ip *ip, int atomic);
+ int unregister_usprobe(struct task_struct *task, struct us_ip *ip, int atomic, int no_rp2);
+ 
  #define user_backtrace(size) \
        do { \
                us_proc_ip_t *ip = __get_cpu_var(gpCurIp); \

diff --cc kprobe/arch/asm-arm/dbi_kprobes.c
Simple merge

diff --cc kprobe/arch/asm-x86/dbi_kprobes.c
Simple merge

diff --cc kprobe/arch/dbi_kprobes.c
index 2187a04,88fb2d1..c923035
--- 1/kprobe/arch/dbi_kprobes.c
--- 2/kprobe/arch/dbi_kprobes.c
+++ b/kprobe/arch/dbi_kprobes.c
@@@ -58,15 -58,7 +58,13 @@@
  #include <linux/module.h>
  #include <ksyms.h>
  
- 
 +extern unsigned long sched_addr;
 +extern unsigned long fork_addr;
 +extern unsigned long exit_addr;
 +
 +extern struct hlist_head kprobe_insn_pages;
 +extern struct hlist_head uprobe_insn_pages;
  
- 
  void arch_remove_kprobe (struct kprobe *p, struct task_struct *task)
  {
        // TODO: check boostable for x86 and MIPS

diff --cc kprobe/dbi_kprobes.c
index 6280466,e7b1714..b98c81f
--- 1/kprobe/dbi_kprobes.c
--- 2/kprobe/dbi_kprobes.c
+++ b/kprobe/dbi_kprobes.c
@@@ -68,21 -68,15 +68,19 @@@
  #include <linux/mm.h>
  #include <linux/pagemap.h>
  
- 
- 
 +extern unsigned long sched_addr;
 +extern unsigned long fork_addr;
 +extern unsigned long exit_addr;
 +extern struct hlist_head kprobe_insn_pages;
  
  DEFINE_PER_CPU (struct kprobe *, current_kprobe) = NULL;
- DEFINE_PER_CPU (struct kprobe_ctlblk, kprobe_ctlblk);
+ static DEFINE_PER_CPU (struct kprobe_ctlblk, kprobe_ctlblk);
  
  DEFINE_SPINLOCK (kretprobe_lock);     /* Protects kretprobe_inst_table */
- DEFINE_PER_CPU (struct kprobe *, kprobe_instance) = NULL;
+ static DEFINE_PER_CPU (struct kprobe *, kprobe_instance) = NULL;
  
  struct hlist_head kprobe_table[KPROBE_TABLE_SIZE];
- struct hlist_head kretprobe_inst_table[KPROBE_TABLE_SIZE];
+ static struct hlist_head kretprobe_inst_table[KPROBE_TABLE_SIZE];
  
  atomic_t kprobe_count;
  

diff --cc kprobe/dbi_kprobes.h
Simple merge

diff --cc kprobe/dbi_kprobes_deps.c
index 986f3ba,79da725..67dd17a
--- 1/kprobe/dbi_kprobes_deps.c
--- 2/kprobe/dbi_kprobes_deps.c
+++ b/kprobe/dbi_kprobes_deps.c
@@@ -38,10 -38,9 +38,10 @@@
  
  unsigned long sched_addr;
  unsigned long fork_addr;
 +unsigned long exit_addr;
  
  #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 29)
- struct mm_struct* init_mm_ptr;
+ static struct mm_struct* init_mm_ptr;
  struct mm_struct init_mm;
  #endif
  

diff --cc kprobe/dbi_uprobes.c
Simple merge