Re: [PATCH tip/core/rcu 10/14] rcu: Remove function versions of __kfree_rcu and __is_kfree_rcu_offset

Josh Triplett
2012-06-15T21:00:09Z

On Fri, Jun 15, 2012 at 01:13:11PM -0700, Paul E. McKenney wrote:
> From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
>
> Commit d8169d4c (Make __kfree_rcu() less dependent on compiler choices)
> added cpp macro versions of __kfree_rcu() and __is_kfree_rcu_offset(),
> but failed to remove the old inline-function versions. This commit does
> this cleanup.
>
> Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>

Reviewed-by: Josh Triplett <josh@joshtriplett.org>

> include/linux/rcupdate.h | 18 ------------------
> 1 files changed, 0 insertions(+), 18 deletions(-)
>
> diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
> index f773a4a..4874d26 100644
> --- a/include/linux/rcupdate.h
> +++ b/include/linux/rcupdate.h
> @@ -917,24 +917,6 @@ static inline notrace void rcu_read_unlock_sched_notrace(void)
> #define INIT_RCU_POINTER(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()?
> --
> 1.7.8
>