From 64474e57fdd89256a161e9ee06e86d0088daf322 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Mon, 4 Jan 2016 17:23:09 +0000
Subject: [PATCH] [rt] latency_hist: Update sched_switch probe

---
 debian/changelog                              |  1 +
 ...tency_hist-update-sched_switch-probe.patch | 30 +++++++++++++++++++
 debian/patches/series-rt                      |  1 +
 3 files changed, 32 insertions(+)
 create mode 100644 debian/patches/features/all/rt/latency_hist-update-sched_switch-probe.patch

diff --git a/debian/changelog b/debian/changelog
index ae5a1d5c9..c3d5befd1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ linux (4.4~rc8-1~exp1) UNRELEASED; urgency=medium
   [ Ben Hutchings ]
   * [rt] Update to 4.4-rc6-rt1 and re-enable
   * [rt] Fix build error in kernel/time/hrtimer.c
+  * [rt] latency_hist: Update sched_switch probe
   * [armhf] Add support for BCM2836 and Raspberry Pi 2:
     - pwm: bcm2835: Calculate scaler in ->config()
     - pwm: bcm2835: Prevent division by zero
diff --git a/debian/patches/features/all/rt/latency_hist-update-sched_switch-probe.patch b/debian/patches/features/all/rt/latency_hist-update-sched_switch-probe.patch
new file mode 100644
index 000000000..e62a21f46
--- /dev/null
+++ b/debian/patches/features/all/rt/latency_hist-update-sched_switch-probe.patch
@@ -0,0 +1,30 @@
+From: Ben Hutchings <ben@decadent.org.uk>
+Date: Mon, 04 Jan 2016 17:19:33 +0000
+Subject: latency_hist: Update sched_switch probe
+
+Commit c73464b1c843 ("sched/core: Fix trace_sched_switch()") adds a
+'bool preempt' parameter to probe functions, so change
+probe_wakeup_latency_hist_stop() accordingly..
+
+Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
+---
+--- a/kernel/trace/latency_hist.c
++++ b/kernel/trace/latency_hist.c
+@@ -116,7 +116,7 @@ static char *wakeup_latency_hist_dir = "
+ static char *wakeup_latency_hist_dir_sharedprio = "sharedprio";
+ static notrace void probe_wakeup_latency_hist_start(void *v,
+ 	struct task_struct *p);
+-static notrace void probe_wakeup_latency_hist_stop(void *v,
++static notrace void probe_wakeup_latency_hist_stop(void *v, bool preempt,
+ 	struct task_struct *prev, struct task_struct *next);
+ static notrace void probe_sched_migrate_task(void *,
+ 	struct task_struct *task, int cpu);
+@@ -906,7 +906,7 @@ out:
+ 	raw_spin_unlock_irqrestore(&wakeup_lock, flags);
+ }
+ 
+-static notrace void probe_wakeup_latency_hist_stop(void *v,
++static notrace void probe_wakeup_latency_hist_stop(void *v, bool preempt,
+ 	struct task_struct *prev, struct task_struct *next)
+ {
+ 	unsigned long flags;
diff --git a/debian/patches/series-rt b/debian/patches/series-rt
index 2e209893f..6c26cd38b 100644
--- a/debian/patches/series-rt
+++ b/debian/patches/series-rt
@@ -556,6 +556,7 @@ features/all/rt/workqueue-prevent-deadlock-stall.patch
 
 # TRACING
 features/all/rt/latency_hist-update-sched_wakeup-probe.patch
+features/all/rt/latency_hist-update-sched_switch-probe.patch
 
 # Add RT to version
 features/all/rt/localversion.patch