From f1049b6e52fcc229d0a42914ff84b771a1915800 Mon Sep 17 00:00:00 2001
From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Date: Fri, 25 May 2012 14:25:58 -0700
Subject: [PATCH] --- yaml --- r: 312189 b: refs/heads/master c:
 28f5c693d03530eb15c5354f758b789189b98c37 h: refs/heads/master i:   312187:
 b5d7b1e47e89ae49b81e2e0c035b0a7d7851bc54 v: v3

---
 [refs]                         |  2 +-
 trunk/include/linux/rcupdate.h | 18 ------------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index 0d7517486ff5..28c749d3a027 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a3fa843b555d202e682bf08c65ee1a4a93c79cf
+refs/heads/master: 28f5c693d03530eb15c5354f758b789189b98c37
diff --git a/trunk/include/linux/rcupdate.h b/trunk/include/linux/rcupdate.h
index 698555ebf49b..31568c734525 100644
--- a/trunk/include/linux/rcupdate.h
+++ b/trunk/include/linux/rcupdate.h
@@ -916,24 +916,6 @@ static inline notrace void rcu_read_unlock_sched_notrace(void)
 #define RCU_POINTER_INITIALIZER(p, v) \
 		.p = (typeof(*v) __force __rcu *)(v)
 
-static __always_inline bool __is_kfree_rcu_offset(unsigned long offset)
-{
-	return offset < 4096;
-}
-
-static __always_inline
-void __kfree_rcu(struct rcu_head *head, unsigned long offset)
-{
-	typedef void (*rcu_callback)(struct rcu_head *);
-
-	BUILD_BUG_ON(!__builtin_constant_p(offset));
-
-	/* See the kfree_rcu() header comment. */
-	BUILD_BUG_ON(!__is_kfree_rcu_offset(offset));
-
-	kfree_call_rcu(head, (rcu_callback)offset);
-}
-
 /*
  * Does the specified offset indicate that the corresponding rcu_head
  * structure can be handled by kfree_rcu()?