[REFACTOR] remove unused code

global variables:
	probes_flags,
	us_proc_probes

functions:
	install_kernel_probe(),
	uninstall_kernel_probe()

diff --git a/driver/probes_manager.c b/driver/probes_manager.c
index b328197..7b9d389 100644 (file)
--- a/driver/probes_manager.c
+++ b/driver/probes_manager.c
@@ -20,27 +20,10 @@
 #include "module.h"
 #include "probes_manager.h"
 
-#ifdef EC_ARCH_arm
-/* ARCH == arm */
-#include "../kprobe/dbi_kprobes.h"
-#endif /* def EC_ARCH_arm */
-
-#ifdef EC_ARCH_x86
-/* ARCH == x86 */
-//#include <linux/kprobes.h>
-#include "../kprobe/dbi_kprobes.h"
-#endif /* def EC_ARCH_x86 */
-
-#ifdef EC_ARCH_mips
-/* ARCH == mips */
-#include "../kprobe/dbi_kprobes.h"
-#endif /* def EC_ARCH_mips */
-
 unsigned long pf_addr;
 unsigned long cp_addr;
 unsigned long mr_addr;
 unsigned long unmap_addr;
-unsigned int probes_flags = 0;
 
 int
 probes_manager_init (void)

diff --git a/driver/probes_manager.h b/driver/probes_manager.h
index bb63bf8..9a9bff7 100644 (file)
--- a/driver/probes_manager.h
+++ b/driver/probes_manager.h
@@ -55,7 +55,6 @@ extern unsigned long pf_addr;
 extern unsigned long cp_addr;
 extern unsigned long mr_addr;
 extern unsigned long unmap_addr;
-extern unsigned int probes_flags;
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 38)
 extern spinlock_t ec_probe_spinlock;
 #endif /* LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 38) */

diff --git a/driver/us_proc_inst.c b/driver/us_proc_inst.c
index dcb1fa2..7ff473c 100644 (file)
--- a/driver/us_proc_inst.c
+++ b/driver/us_proc_inst.c
@@ -53,8 +53,6 @@ void ujprobe_event_handler (unsigned long arg1, unsigned long arg2, unsigned lon
 int uretprobe_event_handler(struct uretprobe_instance *probe, struct pt_regs *regs, struct us_ip *ip);
 
 
-int us_proc_probes;
-
 LIST_HEAD(proc_probes_list);
 
 #define print_event(fmt, args...)                                              \
@@ -393,37 +391,6 @@ int install_otg_ip(unsigned long addr,
 }
 EXPORT_SYMBOL_GPL(install_otg_ip);
 
-static int uninstall_kernel_probe (unsigned long addr, int uflag, int kflag, kernel_probe_t ** pprobe)
-{
-       kernel_probe_t *probe = NULL;
-       int iRet = 0;
-       if (probes_flags & kflag) {
-               probe = find_probe(addr);
-               if (probe) {
-                       iRet = remove_probe_from_list (addr);
-                       if (iRet)
-                               EPRINTF ("remove_probe_from_list(0x%lx) result=%d!", addr, iRet);
-                       if (pprobe)
-                               *pprobe = NULL;
-               }
-               probes_flags &= ~kflag;
-       }
-       if (us_proc_probes & uflag) {
-               if (!(probes_flags & uflag)) {
-                       if (probe) {
-                               iRet = unregister_kernel_probe(probe);
-                               if (iRet) {
-                                       EPRINTF ("unregister_kernel_probe(0x%lx) result=%d!",
-                                                       addr, iRet);
-                                       return iRet;
-                               }
-                       }
-               }
-               us_proc_probes &= ~uflag;
-       }
-       return iRet;
-}
-
 static int uninstall_us_proc_probes(struct task_struct *task, struct sspt_procs *procs, enum US_FLAGS flag);
 
 int deinst_usr_space_proc (void)
@@ -501,39 +468,6 @@ int deinst_usr_space_proc (void)
 
        return iRet;
 }
-static int install_kernel_probe (unsigned long addr, int uflag, int kflag, kernel_probe_t ** pprobe)
-{
-       kernel_probe_t *probe = NULL;
-       int iRet = 0;
-
-       DPRINTF("us_proc_probes = 0x%x, uflag = 0x%x, "
-                       "probes_flags = 0x%x, kflag = 0x%x",
-                       us_proc_probes, uflag, probes_flags, kflag);
-
-       if (!(probes_flags & kflag)) {
-               iRet = add_probe_to_list (addr, &probe);
-               if (iRet) {
-                       EPRINTF ("add_probe_to_list(0x%lx) result=%d!", addr, iRet);
-                       return iRet;
-               }
-               probes_flags |= kflag;
-       }
-       if (!(us_proc_probes & uflag)) {
-               if (!(probes_flags & uflag)) {
-                       iRet = register_kernel_probe (probe);
-                       if (iRet) {
-                               EPRINTF ("register_kernel_probe(0x%lx) result=%d!", addr, iRet);
-                               return iRet;
-                       }
-               }
-               us_proc_probes |= uflag;
-       }
-
-       if (probe)
-               *pprobe = probe;
-
-       return 0;
-}
 
 static void install_proc_probes(struct task_struct *task, struct sspt_procs *procs, int atomic);
 

diff --git a/driver/us_proc_inst.h b/driver/us_proc_inst.h
index 79193f8..cb3faa8 100644 (file)
--- a/driver/us_proc_inst.h
+++ b/driver/us_proc_inst.h
@@ -28,7 +28,6 @@
 extern int inst_usr_space_proc (void);
 extern int deinst_usr_space_proc (void);
 
-extern int us_proc_probes;
 extern pid_t gl_nNotifyTgid;
 
 /* forward declarations */