From patchwork Fri Jun 8 04:26:55 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: 9174 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 3BCBC23F0F for ; Fri, 8 Jun 2012 04:29:20 +0000 (UTC) Received: from mail-gh0-f180.google.com (mail-gh0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id 0BD26A186F5 for ; Fri, 8 Jun 2012 04:29:19 +0000 (UTC) Received: by ghbz12 with SMTP id z12so1068527ghb.11 for ; Thu, 07 Jun 2012 21:29:19 -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=4BpnPDL+usOEcsPAAuE0xvFQ/Yu2HZqEFn2hxQrjZOg=; b=PIbJc3K76pwsppshf2l1A4vOBEY9FxYCVTU295CLKzaUQuuyPHIUhVnAkHYcQGMFvT lnTo6UqT53EQLE32pCUD59/7kyHmp5UVyz3+6aRPYP69U2kr4sjAVNXjf4sA5kJL80z/ ttIaB6Mg7GbUAMTg4qQtcD3PR6FS97Oa7oqe+4yOxeWSyYvdxJ0aiVTgDyA01WA5YSkq JJKzWA4zxCE0iRdxMRPsE3QyESzDwFwsjwbW4nTER2uvL+U7EAPklKw1YrU1vaoFUNl6 nvE36sYr+8Nrjky2nmna4fvIOJDY+zSFhJxFXuEbfFcMMXr62Ns/Y4V7aNWvm0N6Nsip m58w== Received: by 10.50.195.234 with SMTP id ih10mr2552323igc.0.1339129759399; Thu, 07 Jun 2012 21:29:19 -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 v20csp14805ibb; Thu, 7 Jun 2012 21:29:18 -0700 (PDT) Received: by 10.68.197.99 with SMTP id it3mr14608784pbc.148.1339129758183; Thu, 07 Jun 2012 21:29:18 -0700 (PDT) Received: from e31.co.us.ibm.com (e31.co.us.ibm.com. [32.97.110.149]) by mx.google.com with ESMTPS id pk6si8831712pbc.0.2012.06.07.21.29.17 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 07 Jun 2012 21:29:18 -0700 (PDT) Received-SPF: pass (google.com: domain of paulmck@linux.vnet.ibm.com designates 32.97.110.149 as permitted sender) client-ip=32.97.110.149; Authentication-Results: mx.google.com; spf=pass (google.com: domain of paulmck@linux.vnet.ibm.com designates 32.97.110.149 as permitted sender) smtp.mail=paulmck@linux.vnet.ibm.com Received: from /spool/local by e31.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 7 Jun 2012 22:29:17 -0600 Received: from d03dlp02.boulder.ibm.com (9.17.202.178) by e31.co.us.ibm.com (192.168.1.131) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 7 Jun 2012 22:29:16 -0600 Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106]) by d03dlp02.boulder.ibm.com (Postfix) with ESMTP id 4DDFC3E4004F; Fri, 8 Jun 2012 04:27:49 +0000 (WET) Received: from d03av01.boulder.ibm.com (d03av01.boulder.ibm.com [9.17.195.167]) by d03relay04.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q584RIhG046076; Thu, 7 Jun 2012 22:27:33 -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 q584QxGp006646; Thu, 7 Jun 2012 22:27:01 -0600 Received: from paulmck-ThinkPad-W500 (sig-9-65-78-192.mts.ibm.com [9.65.78.192]) by d03av01.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q584QwbX006565; Thu, 7 Jun 2012 22:26:59 -0600 Received: by paulmck-ThinkPad-W500 (Postfix, from userid 1000) id B4DB3E51F1; Thu, 7 Jun 2012 21:26:57 -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" , "Paul E. McKenney" Subject: [PATCH rcu 8/8] rcu: Fix qlen_lazy breakage Date: Thu, 7 Jun 2012 21:26:55 -0700 Message-Id: <1339129615-1795-8-git-send-email-paulmck@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.8 In-Reply-To: <1339129615-1795-1-git-send-email-paulmck@linux.vnet.ibm.com> References: <20120608042632.GA1250@linux.vnet.ibm.com> <1339129615-1795-1-git-send-email-paulmck@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12060804-7282-0000-0000-000009B85AC3 X-Gm-Message-State: ALoCoQmKZC9xFDG4ypsRrrztm1yHEVSk6X/Q0z7n+wni31W1GCZ1xNK+INILZANhB6JmDVumPKRK From: "Paul E. McKenney" Commit d8169d4c (Make __kfree_rcu() less dependent on compiler choices) created a macro out of an inline function in order to avoid build breakage for certain combinations of gcc flags. Unfortunately, it also converted a kfree_call_rcu() to a call_rcu(), which made the rcu_data structure's ->qlen_lazy field lose counts. This commit therefore changes the call_rcu() back to kfree_call_rcu(). Signed-off-by: Paul E. McKenney Signed-off-by: Paul E. McKenney --- include/linux/rcupdate.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h index 26d1a47..62956c7 100644 --- a/include/linux/rcupdate.h +++ b/include/linux/rcupdate.h @@ -936,7 +936,7 @@ void __kfree_rcu(struct rcu_head *head, unsigned long offset) #define __kfree_rcu(head, offset) \ do { \ BUILD_BUG_ON(!__is_kfree_rcu_offset(offset)); \ - call_rcu(head, (void (*)(struct rcu_head *))(unsigned long)(offset)); \ + kfree_call_rcu(head, (void (*)(struct rcu_head *))(unsigned long)(offset)); \ } while (0) /**