perf trace: Do not require --no-syscalls to suppress strace like output

[linux-2.6-microblaze.git] / kernel / test_kprobes.c

diff --git a/kernel/test_kprobes.c b/kernel/test_kprobes.c
index dd53e35..7bca480 100644 (file)
--- a/kernel/test_kprobes.c
+++ b/kernel/test_kprobes.c
@@ -162,90 +162,6 @@ static int test_kprobes(void)
 
 }
 
-#if 0
-static u32 jph_val;
-
-static u32 j_kprobe_target(u32 value)
-{
-       if (preemptible()) {
-               handler_errors++;
-               pr_err("jprobe-handler is preemptible\n");
-       }
-       if (value != rand1) {
-               handler_errors++;
-               pr_err("incorrect value in jprobe handler\n");
-       }
-
-       jph_val = rand1;
-       jprobe_return();
-       return 0;
-}
-
-static struct jprobe jp = {
-       .entry          = j_kprobe_target,
-       .kp.symbol_name = "kprobe_target"
-};
-
-static int test_jprobe(void)
-{
-       int ret;
-
-       ret = register_jprobe(&jp);
-       if (ret < 0) {
-               pr_err("register_jprobe returned %d\n", ret);
-               return ret;
-       }
-
-       ret = target(rand1);
-       unregister_jprobe(&jp);
-       if (jph_val == 0) {
-               pr_err("jprobe handler not called\n");
-               handler_errors++;
-       }
-
-       return 0;
-}
-
-static struct jprobe jp2 = {
-       .entry          = j_kprobe_target,
-       .kp.symbol_name = "kprobe_target2"
-};
-
-static int test_jprobes(void)
-{
-       int ret;
-       struct jprobe *jps[2] = {&jp, &jp2};
-
-       /* addr and flags should be cleard for reusing kprobe. */
-       jp.kp.addr = NULL;
-       jp.kp.flags = 0;
-       ret = register_jprobes(jps, 2);
-       if (ret < 0) {
-               pr_err("register_jprobes returned %d\n", ret);
-               return ret;
-       }
-
-       jph_val = 0;
-       ret = target(rand1);
-       if (jph_val == 0) {
-               pr_err("jprobe handler not called\n");
-               handler_errors++;
-       }
-
-       jph_val = 0;
-       ret = target2(rand1);
-       if (jph_val == 0) {
-               pr_err("jprobe handler2 not called\n");
-               handler_errors++;
-       }
-       unregister_jprobes(jps, 2);
-
-       return 0;
-}
-#else
-#define test_jprobe() (0)
-#define test_jprobes() (0)
-#endif
 #ifdef CONFIG_KRETPROBES
 static u32 krph_val;
 
@@ -383,16 +299,6 @@ int init_test_probes(void)
        if (ret < 0)
                errors++;
 
-       num_tests++;
-       ret = test_jprobe();
-       if (ret < 0)
-               errors++;
-
-       num_tests++;
-       ret = test_jprobes();
-       if (ret < 0)
-               errors++;
-
 #ifdef CONFIG_KRETPROBES
        num_tests++;
        ret = test_kretprobe();