[linux] 02/03: [rt] Fix trace function type mismatch introduced in 3.2.77-rt111

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch wheezy
in repository linux.

commit 031b17085c4cd8cd2ff22a9a4d42a13ab8de8d78
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Mon Mar 7 02:33:17 2016 +0000

    [rt] Fix trace function type mismatch introduced in 3.2.77-rt111
---
 debian/changelog                                   |  1 +
 ...troduce-the-trace_sched_waking-tracepoint.patch | 48 +++++++++++++---------
 2 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4eb78fa..7b03ac5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -312,6 +312,7 @@ linux (3.2.78-1) UNRELEASED; urgency=medium
     (regression in 3.2.78)
   * crypto: {blk,giv}cipher: Set has_setkey (avoids regressing cryptsetup;
     see #815480)
+  * [rt] Fix trace function type mismatch introduced in 3.2.77-rt111
 
  -- Ben Hutchings <ben at decadent.org.uk>  Wed, 02 Mar 2016 15:02:45 +0000
 
diff --git a/debian/patches/features/all/rt/0378-sched-Introduce-the-trace_sched_waking-tracepoint.patch b/debian/patches/features/all/rt/0378-sched-Introduce-the-trace_sched_waking-tracepoint.patch
index 486e94a..41aed33 100644
--- a/debian/patches/features/all/rt/0378-sched-Introduce-the-trace_sched_waking-tracepoint.patch
+++ b/debian/patches/features/all/rt/0378-sched-Introduce-the-trace_sched_waking-tracepoint.patch
@@ -39,15 +39,9 @@ CC: Ingo Molnar <mingo at kernel.org>
 Link: http://lkml.kernel.org/r/20150609091336.GQ3644@twins.programming.kicks-ass.net
 Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
 Signed-off-by: Steven Rostedt <rostedt at goodmis.org>
+[bwh: Adjust probe_wakeup_latency_hist_start() to match modified
+ sched_wakeup_template]
 ---
- include/trace/events/sched.h      | 30 +++++++++++++++++++++---------
- kernel/sched.c                    |  7 +++++--
- kernel/trace/trace_sched_switch.c |  2 +-
- kernel/trace/trace_sched_wakeup.c |  2 +-
- 4 files changed, 28 insertions(+), 13 deletions(-)
-
-diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h
-index 959ff18b63b6..29cfc3fe68ad 100644
 --- a/include/trace/events/sched.h
 +++ b/include/trace/events/sched.h
 @@ -54,9 +54,9 @@ TRACE_EVENT(sched_kthread_stop_ret,
@@ -62,7 +56,7 @@ index 959ff18b63b6..29cfc3fe68ad 100644
  
  	TP_STRUCT__entry(
  		__array(	char,	comm,	TASK_COMM_LEN	)
-@@ -70,25 +70,37 @@ DECLARE_EVENT_CLASS(sched_wakeup_template,
+@@ -70,25 +70,37 @@ DECLARE_EVENT_CLASS(sched_wakeup_templat
  		memcpy(__entry->comm, p->comm, TASK_COMM_LEN);
  		__entry->pid		= p->pid;
  		__entry->prio		= p->prio;
@@ -107,11 +101,9 @@ index 959ff18b63b6..29cfc3fe68ad 100644
  
  #ifdef CREATE_TRACE_POINTS
  static inline long __trace_sched_switch_state(struct task_struct *p)
-diff --git a/kernel/sched.c b/kernel/sched.c
-index 1615ca209afd..a9f6d6c0ab93 100644
 --- a/kernel/sched.c
 +++ b/kernel/sched.c
-@@ -2661,10 +2661,11 @@ static void ttwu_activate(struct rq *rq, struct task_struct *p, int en_flags)
+@@ -2661,10 +2661,11 @@ static void ttwu_activate(struct rq *rq,
  static void
  ttwu_do_wakeup(struct rq *rq, struct task_struct *p, int wake_flags)
  {
@@ -124,7 +116,7 @@ index 1615ca209afd..a9f6d6c0ab93 100644
  #ifdef CONFIG_SMP
  	if (p->sched_class->task_woken)
  		p->sched_class->task_woken(rq, p);
-@@ -2852,6 +2853,8 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
+@@ -2852,6 +2853,8 @@ try_to_wake_up(struct task_struct *p, un
  	if (!(wake_flags & WF_LOCK_SLEEPER))
  		p->saved_state = TASK_RUNNING;
  
@@ -133,7 +125,7 @@ index 1615ca209afd..a9f6d6c0ab93 100644
  	success = 1; /* we're going to change ->state */
  	cpu = task_cpu(p);
  
-@@ -3070,7 +3073,7 @@ void wake_up_new_task(struct task_struct *p)
+@@ -3070,7 +3073,7 @@ void wake_up_new_task(struct task_struct
  	rq = __task_rq_lock(p);
  	activate_task(rq, p, 0);
  	p->on_rq = 1;
@@ -142,11 +134,9 @@ index 1615ca209afd..a9f6d6c0ab93 100644
  	check_preempt_curr(rq, p, WF_FORK);
  #ifdef CONFIG_SMP
  	if (p->sched_class->task_woken)
-diff --git a/kernel/trace/trace_sched_switch.c b/kernel/trace/trace_sched_switch.c
-index 7e62c0a18456..5982146ee863 100644
 --- a/kernel/trace/trace_sched_switch.c
 +++ b/kernel/trace/trace_sched_switch.c
-@@ -108,7 +108,7 @@ tracing_sched_wakeup_trace(struct trace_array *tr,
+@@ -108,7 +108,7 @@ tracing_sched_wakeup_trace(struct trace_
  }
  
  static void
@@ -155,11 +145,9 @@ index 7e62c0a18456..5982146ee863 100644
  {
  	struct trace_array_cpu *data;
  	unsigned long flags;
-diff --git a/kernel/trace/trace_sched_wakeup.c b/kernel/trace/trace_sched_wakeup.c
-index 6857e0c99656..a3f6ef0642f1 100644
 --- a/kernel/trace/trace_sched_wakeup.c
 +++ b/kernel/trace/trace_sched_wakeup.c
-@@ -403,7 +403,7 @@ static void wakeup_reset(struct trace_array *tr)
+@@ -403,7 +403,7 @@ static void wakeup_reset(struct trace_ar
  }
  
  static void
@@ -168,3 +156,23 @@ index 6857e0c99656..a3f6ef0642f1 100644
  {
  	struct trace_array_cpu *data;
  	int cpu = smp_processor_id();
+--- a/kernel/trace/latency_hist.c
++++ b/kernel/trace/latency_hist.c
+@@ -114,7 +114,7 @@ static DEFINE_PER_CPU(struct hist_data,
+ static char *wakeup_latency_hist_dir = "wakeup";
+ static char *wakeup_latency_hist_dir_sharedprio = "sharedprio";
+ static notrace void probe_wakeup_latency_hist_start(void *v,
+-    struct task_struct *p, int success);
++    struct task_struct *p);
+ static notrace void probe_wakeup_latency_hist_stop(void *v,
+     struct task_struct *prev, struct task_struct *next);
+ static notrace void probe_sched_migrate_task(void *,
+@@ -868,7 +868,7 @@ static notrace void probe_sched_migrate_
+ }
+ 
+ static notrace void probe_wakeup_latency_hist_start(void *v,
+-    struct task_struct *p, int success)
++    struct task_struct *p)
+ {
+ 	unsigned long flags;
+ 	struct task_struct *curr = current;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git