From patchwork Fri Jun 15 20:13:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul E. McKenney" X-Patchwork-Id: 9339 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id AA89C23E5A for ; Fri, 15 Jun 2012 20:13:34 +0000 (UTC) Received: from mail-yw0-f52.google.com (mail-yw0-f52.google.com [209.85.213.52]) by fiordland.canonical.com (Postfix) with ESMTP id 77C57A184D4 for ; Fri, 15 Jun 2012 20:13:34 +0000 (UTC) Received: by mail-yw0-f52.google.com with SMTP id p61so3061900yhp.11 for ; Fri, 15 Jun 2012 13:13:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-content-scanned:x-cbid:x-gm-message-state; bh=0AVhWI7VEtnVVoXmMsEnvmMrypgVHe6pMDMKxouHCfY=; b=eydSo1uufkYRxb8JdQzCxKF/Mb7txE7Eb0x3ebk0fFqvLfRr/3jdnKuEciCVPxoq6m vyX35UkkDWMvKT5bgXxZcvHWvuay01VuxmG+zxizynVhHeJn/S0vh97sLq/cjFrRrEUK r4KuxkvD5YlKWWO7yrNWFkagRCqLt1n6ZvEoTwVA9Dpzxavb2+G50L0nOntsPqEwecKI mr83Blw4s4+qupvkCfOKaIBW/McBMy+aEvMdYbPZhHeua2Lj6VwfYSTIoaURF1UV8WgQ hRKs71e4vZlFTgyLCmhYVZ3kFEN8XR6kXx2Hr9ZPEFHJjFWIHDAGwOvwW2+DLZb7qSHq WNhQ== Received: by 10.50.193.196 with SMTP id hq4mr3166311igc.57.1339791214037; Fri, 15 Jun 2012 13:13:34 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.24.148 with SMTP id v20csp167540ibb; Fri, 15 Jun 2012 13:13:33 -0700 (PDT) Received: by 10.68.217.229 with SMTP id pb5mr23447886pbc.20.1339791213172; Fri, 15 Jun 2012 13:13:33 -0700 (PDT) Received: from e33.co.us.ibm.com (e33.co.us.ibm.com. [32.97.110.151]) by mx.google.com with ESMTPS id mo5si762691pbc.208.2012.06.15.13.13.32 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 15 Jun 2012 13:13:33 -0700 (PDT) Received-SPF: pass (google.com: domain of paulmck@linux.vnet.ibm.com designates 32.97.110.151 as permitted sender) client-ip=32.97.110.151; Authentication-Results: mx.google.com; spf=pass (google.com: domain of paulmck@linux.vnet.ibm.com designates 32.97.110.151 as permitted sender) smtp.mail=paulmck@linux.vnet.ibm.com Received: from /spool/local by e33.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 15 Jun 2012 14:13:32 -0600 Received: from d03dlp02.boulder.ibm.com (9.17.202.178) by e33.co.us.ibm.com (192.168.1.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 15 Jun 2012 14:13:30 -0600 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by d03dlp02.boulder.ibm.com (Postfix) with ESMTP id 397123E40051 for ; Fri, 15 Jun 2012 20:13:28 +0000 (WET) Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q5FKDQk9134914 for ; Fri, 15 Jun 2012 14:13:26 -0600 Received: from d03av01.boulder.ibm.com (loopback [127.0.0.1]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q5FKDKwL015553 for ; Fri, 15 Jun 2012 14:13:26 -0600 Received: from paulmck-ThinkPad-W500 ([9.47.24.152]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q5FKDIOv015502; Fri, 15 Jun 2012 14:13:18 -0600 Received: by paulmck-ThinkPad-W500 (Postfix, from userid 1000) id 89FD5E528B; Fri, 15 Jun 2012 13:13:18 -0700 (PDT) From: "Paul E. McKenney" To: linux-kernel@vger.kernel.org Cc: mingo@elte.hu, laijs@cn.fujitsu.com, dipankar@in.ibm.com, akpm@linux-foundation.org, mathieu.desnoyers@polymtl.ca, josh@joshtriplett.org, niv@us.ibm.com, tglx@linutronix.de, peterz@infradead.org, rostedt@goodmis.org, Valdis.Kletnieks@vt.edu, dhowells@redhat.com, eric.dumazet@gmail.com, darren@dvhart.com, fweisbec@gmail.com, patches@linaro.org, "Paul E. McKenney" Subject: [PATCH tip/core/rcu 10/14] rcu: Remove function versions of __kfree_rcu and __is_kfree_rcu_offset Date: Fri, 15 Jun 2012 13:13:11 -0700 Message-Id: <1339791195-26389-10-git-send-email-paulmck@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.8 In-Reply-To: <1339791195-26389-1-git-send-email-paulmck@linux.vnet.ibm.com> References: <20120615201256.GA26120@linux.vnet.ibm.com> <1339791195-26389-1-git-send-email-paulmck@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12061520-2398-0000-0000-0000078AB74E X-Gm-Message-State: ALoCoQnyUztlEsQntBFN2lbxGpXRpg8jSjZT4ZeKWwxPvyPpCxndvl+R0fdI2kCrlzxJzbdLDS9i From: "Paul E. McKenney" 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 Reviewed-by: Josh Triplett --- 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()?