diff --git a/[refs] b/[refs]
index 5526571b3f43..fd7c43685fbe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00f62f614bb713027b9296068d1879fbca511eb7
+refs/heads/master: b22f4858126a6aa852ad745b94f6b25dbdea708e
diff --git a/trunk/kernel/trace/Kconfig b/trunk/kernel/trace/Kconfig
index 3a331289457a..6ff928acd453 100644
--- a/trunk/kernel/trace/Kconfig
+++ b/trunk/kernel/trace/Kconfig
@@ -134,6 +134,7 @@ config SYSPROF_TRACER
 	bool "Sysprof Tracer"
 	depends on X86
 	select TRACING
+	select CONTEXT_SWITCH_TRACER
 	help
 	  This tracer provides the trace needed by the 'Sysprof' userspace
 	  tool.
diff --git a/trunk/kernel/trace/ring_buffer.c b/trunk/kernel/trace/ring_buffer.c
index 27ef3bf13ed2..53ba3a6d16d0 100644
--- a/trunk/kernel/trace/ring_buffer.c
+++ b/trunk/kernel/trace/ring_buffer.c
@@ -273,8 +273,8 @@ struct ring_buffer {
 	unsigned			pages;
 	unsigned			flags;
 	int				cpus;
-	atomic_t			record_disabled;
 	cpumask_var_t			cpumask;
+	atomic_t			record_disabled;
 
 	struct mutex			mutex;
 
diff --git a/trunk/kernel/trace/trace_sysprof.c b/trunk/kernel/trace/trace_sysprof.c
index 84ca9d81e74d..9902c15997ad 100644
--- a/trunk/kernel/trace/trace_sysprof.c
+++ b/trunk/kernel/trace/trace_sysprof.c
@@ -238,6 +238,8 @@ static int stack_trace_init(struct trace_array *tr)
 {
 	sysprof_trace = tr;
 
+	tracing_start_cmdline_record();
+
 	mutex_lock(&sample_timer_lock);
 	start_stack_timers();
 	tracer_enabled = 1;
@@ -247,6 +249,7 @@ static int stack_trace_init(struct trace_array *tr)
 
 static void stack_trace_reset(struct trace_array *tr)
 {
+	tracing_stop_cmdline_record();
 	stop_stack_trace(tr);
 }