From e5302c7c3b0aaaf45fd265ac782bc8ad5b5fb7b3 Mon Sep 17 00:00:00 2001
From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Date: Tue, 31 May 2011 21:03:55 -0700
Subject: [PATCH] --- yaml --- r: 268945 b: refs/heads/master c:
 990987511c200877bb20201772d5de46644151f2 h: refs/heads/master i:   268943:
 16907c233c034e012969696ceb93f01272308651 v: v3

---
 [refs]                         |  2 +-
 trunk/include/linux/rcupdate.h | 11 +----------
 trunk/include/linux/types.h    | 10 ++++++++++
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 1462a3dabbf4..2ccf1927f851 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3fbab0571eb09746cc0283648165ec00efc8eb2
+refs/heads/master: 990987511c200877bb20201772d5de46644151f2
diff --git a/trunk/include/linux/rcupdate.h b/trunk/include/linux/rcupdate.h
index 8e7470d8b676..87bd390df73f 100644
--- a/trunk/include/linux/rcupdate.h
+++ b/trunk/include/linux/rcupdate.h
@@ -33,6 +33,7 @@
 #ifndef __LINUX_RCUPDATE_H
 #define __LINUX_RCUPDATE_H
 
+#include <linux/types.h>
 #include <linux/cache.h>
 #include <linux/spinlock.h>
 #include <linux/threads.h>
@@ -64,16 +65,6 @@ static inline void rcutorture_record_progress(unsigned long vernum)
 #define ULONG_CMP_GE(a, b)	(ULONG_MAX / 2 >= (a) - (b))
 #define ULONG_CMP_LT(a, b)	(ULONG_MAX / 2 < (a) - (b))
 
-/**
- * struct rcu_head - callback structure for use with RCU
- * @next: next update requests in a list
- * @func: actual update function to call after the grace period.
- */
-struct rcu_head {
-	struct rcu_head *next;
-	void (*func)(struct rcu_head *head);
-};
-
 /* Exported common interfaces */
 extern void call_rcu_sched(struct rcu_head *head,
 			   void (*func)(struct rcu_head *rcu));
diff --git a/trunk/include/linux/types.h b/trunk/include/linux/types.h
index 176da8c1fbb1..57a97234bec1 100644
--- a/trunk/include/linux/types.h
+++ b/trunk/include/linux/types.h
@@ -238,6 +238,16 @@ struct ustat {
 	char			f_fpack[6];
 };
 
+/**
+ * struct rcu_head - callback structure for use with RCU
+ * @next: next update requests in a list
+ * @func: actual update function to call after the grace period.
+ */
+struct rcu_head {
+	struct rcu_head *next;
+	void (*func)(struct rcu_head *head);
+};
+
 #endif	/* __KERNEL__ */
 #endif /*  __ASSEMBLY__ */
 #endif /* _LINUX_TYPES_H */