diff --git a/[refs] b/[refs]
index bc2379b37e15..e68dc3fb4da6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 231e36f4d2e63dd770db80b9f5113310c2bcfcfd
+refs/heads/master: 42cce92f4ddfa41e2dfe26fdcad4887943c032f2
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
index eae6ff693604..c4e90b8cd60d 100644
--- a/trunk/kernel/perf_event.c
+++ b/trunk/kernel/perf_event.c
@@ -1049,8 +1049,8 @@ static int perf_event_refresh(struct perf_event *event, int refresh)
 	return 0;
 }
 
-void __perf_event_sched_out(struct perf_event_context *ctx,
-			      struct perf_cpu_context *cpuctx)
+static void __perf_event_sched_out(struct perf_event_context *ctx,
+				   struct perf_cpu_context *cpuctx)
 {
 	struct perf_event *event;
 
diff --git a/trunk/kernel/trace/trace_kprobe.c b/trunk/kernel/trace/trace_kprobe.c
index d6266cad6953..7ac728ded964 100644
--- a/trunk/kernel/trace/trace_kprobe.c
+++ b/trunk/kernel/trace/trace_kprobe.c
@@ -1507,67 +1507,28 @@ static int kprobe_trace_selftest_target(int a1, int a2, int a3,
 
 static __init int kprobe_trace_self_tests_init(void)
 {
-	int ret, warn = 0;
+	int ret;
 	int (*target)(int, int, int, int, int, int);
-	struct trace_probe *tp;
 
 	target = kprobe_trace_selftest_target;
 
 	pr_info("Testing kprobe tracing: ");
 
 	ret = command_trace_probe("p:testprobe kprobe_trace_selftest_target "
-				  "$stack $stack0 +0($stack)");
-	if (WARN_ON_ONCE(ret)) {
-		pr_warning("error on probing function entry.\n");
-		warn++;
-	} else {
-		/* Enable trace point */
-		tp = find_probe_event("testprobe", KPROBE_EVENT_SYSTEM);
-		if (WARN_ON_ONCE(tp == NULL)) {
-			pr_warning("error on getting new probe.\n");
-			warn++;
-		} else
-			probe_event_enable(&tp->call);
-	}
+				  "$arg1 $arg2 $arg3 $arg4 $stack $stack0");
+	if (WARN_ON_ONCE(ret))
+		pr_warning("error enabling function entry\n");
 
 	ret = command_trace_probe("r:testprobe2 kprobe_trace_selftest_target "
 				  "$retval");
-	if (WARN_ON_ONCE(ret)) {
-		pr_warning("error on probing function return.\n");
-		warn++;
-	} else {
-		/* Enable trace point */
-		tp = find_probe_event("testprobe2", KPROBE_EVENT_SYSTEM);
-		if (WARN_ON_ONCE(tp == NULL)) {
-			pr_warning("error on getting new probe.\n");
-			warn++;
-		} else
-			probe_event_enable(&tp->call);
-	}
-
-	if (warn)
-		goto end;
+	if (WARN_ON_ONCE(ret))
+		pr_warning("error enabling function return\n");
 
 	ret = target(1, 2, 3, 4, 5, 6);
 
-	ret = command_trace_probe("-:testprobe");
-	if (WARN_ON_ONCE(ret)) {
-		pr_warning("error on deleting a probe.\n");
-		warn++;
-	}
-
-	ret = command_trace_probe("-:testprobe2");
-	if (WARN_ON_ONCE(ret)) {
-		pr_warning("error on deleting a probe.\n");
-		warn++;
-	}
-
-end:
 	cleanup_all_probes();
-	if (warn)
-		pr_cont("NG: Some tests are failed. Please check them.\n");
-	else
-		pr_cont("OK\n");
+
+	pr_cont("OK\n");
 	return 0;
 }