From: Kris Van Hees <kris.van.hees@oracle.com>
Date: Thu, 18 Oct 2012 15:50:21 +0000 (+0100)
Subject: dtrace: fix up rq.dtrace_cpu_info member
X-Git-Tag: v4.1.12-92~313^2~105
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7bb27cba761c795f294dbbb4d343894b5e22df60;p=users%2Fjedix%2Flinux-maple.git

dtrace: fix up rq.dtrace_cpu_info member

This moved into sched.h in 3.6, so the member must move there too.

Signed-off-by: Kris Van Hees <kris.van.hees@oracle.com>
---

diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index e0e129993958..b99eaa2152f8 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -9,6 +9,7 @@
 #include <linux/irq_work.h>
 #include <linux/tick.h>
 #include <linux/slab.h>
+#include <linux/dtrace_cpu.h>
 
 #include "cpupri.h"
 #include "cpudeadline.h"
@@ -686,6 +687,9 @@ struct rq {
 	/* Must be inspected within a rcu lock section */
 	struct cpuidle_state *idle_state;
 #endif
+#ifdef CONFIG_DTRACE
+	cpuinfo_t *dtrace_cpu_info;
+#endif
 };
 
 static inline int cpu_of(struct rq *rq)