refresh tracing-Add-combined-timer-and-wakeup-latency-histog.patch
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/tracing-Add-combined-timer-and-wakeup-latency-histog.patch b/tracing-Add-combined-timer-and-wakeup-latency-histog.patch
index e963341..b79a58a 100644
--- a/tracing-Add-combined-timer-and-wakeup-latency-histog.patch
+++ b/tracing-Add-combined-timer-and-wakeup-latency-histog.patch
@@ -1,4 +1,4 @@
-From bd71df37a91fbbd7f672e2dc0fbd953661b71752 Mon Sep 17 00:00:00 2001
+From 0f4a6b445721feb10ca8e12c164c4889ccbf74c6 Mon Sep 17 00:00:00 2001
From: Carsten Emde <C.Emde@osadl.org>
Date: Mon, 18 Oct 2010 22:53:08 +0100
Subject: [PATCH] tracing: Add combined timer and wakeup latency histogram
@@ -121,10 +121,10 @@
PIDs are not considered, if this variable is set to 0.
diff --git a/include/linux/sched.h b/include/linux/sched.h
-index 631c0af..8b9f205 100644
+index 7041cc9..595a960 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
-@@ -1653,6 +1653,9 @@ struct task_struct {
+@@ -1592,6 +1592,9 @@ struct task_struct {
unsigned long trace_recursion;
#ifdef CONFIG_WAKEUP_LATENCY_HIST
u64 preempt_timestamp_hist;
@@ -133,9 +133,9 @@
+#endif
#endif
#endif /* CONFIG_TRACING */
- unsigned long stack_start;
+ #ifdef CONFIG_CGROUP_MEM_RES_CTLR /* memcg uses this to do batch job */
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
-index fb9ec61..1865c4d 100644
+index e966f40..62c8df8 100644
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -266,10 +266,24 @@ config WAKEUP_LATENCY_HIST
