Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp1044501ybv; Fri, 7 Feb 2020 13:19:40 -0800 (PST) X-Google-Smtp-Source: APXvYqyZTNy+ZNVC1zRhvB4nUay32tru2Re8Yc057Kqrx+khTeab8TYdGcD0qCnmGPV1CI97o90p X-Received: by 2002:a05:6808:9b4:: with SMTP id e20mr3288083oig.37.1581110380391; Fri, 07 Feb 2020 13:19:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581110380; cv=none; d=google.com; s=arc-20160816; b=QzbK+EunK0ET1VBUNLjKceysiRUVU8GIe8NLJ0ReP4pxk8aCXpKZHOe1q0t/K2bxAm tBm5/+sxji0kexorkSMxe2llu0RMd7NRqBAX139Cex3kQfiJe5Ap3t1mgS72Wz6FMJjM j+FfAta+G7ksN93QlxWy8tamJD0he/wIhxk2Esfkf/kv6RCZQ87uE6c6wZDRvcwB7Zw4 AUKkvUjYbSkT0QqrxRfxUyB2QQOrd5R+w1MLMpvXliOnx6tUqpq4cWRkpzfo2xP8Rf5Q iXTzXyIXgy81oFE/NcSzZKje8YaeJeT8yhN5vIS1vl089jGNBFif9xIQNU9Wb01c5lz4 sYwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:from:cc:to:subject :content-transfer-encoding:mime-version:references:in-reply-to :user-agent:date; bh=Y4vl85aZHhM6pmftGOhwBbu9CyFhRP3I/NgCwjaBRrU=; b=dsRAudZoCAeHV0mbn9zp+DevCVbpFnQWZf4vb/F8EAsSXywjGOXRRz9lBK38OVqcqx apYr8ebl84FOGbfIYFUwq/up5ZGpDM1UE1oSRdLo+ZcxuMe9jy69kKDMwUrMK4F4lmwy 0zt1uj7uWFqMIQnBTaYfhk1c1dpkaLr8hA2QiPki9DAmYiYk8ExP6aumxDQwY4s/UWjU CHp0FHBrkJ340n1SZXnXTrRzBZe9ZU1CMOweuIPVBavkQtYUo8QQNtZ9PVUT3FXaknLA ahusxmWH3a0e4grdB2RZ+tAHz7JjKXgKzo3XoqRU3ipWCJp+IZKNJ2Mlt2/fDB8Io7pQ wxxw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m16si338422otj.7.2020.02.07.13.19.28; Fri, 07 Feb 2020 13:19:40 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727131AbgBGVSR convert rfc822-to-8bit (ORCPT + 99 others); Fri, 7 Feb 2020 16:18:17 -0500 Received: from smtprelay0235.hostedemail.com ([216.40.44.235]:48245 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727005AbgBGVSR (ORCPT ); Fri, 7 Feb 2020 16:18:17 -0500 X-Greylist: delayed 594 seconds by postgrey-1.27 at vger.kernel.org; Fri, 07 Feb 2020 16:18:16 EST Received: from smtprelay.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by smtpgrave03.hostedemail.com (Postfix) with ESMTP id 895D518033D25 for ; Fri, 7 Feb 2020 21:08:22 +0000 (UTC) Received: from filter.hostedemail.com (clb03-v110.bra.tucows.net [216.40.38.60]) by smtprelay03.hostedemail.com (Postfix) with ESMTP id AFA81837F252; Fri, 7 Feb 2020 21:08:21 +0000 (UTC) X-Session-Marker: 726F737465647440676F6F646D69732E6F7267 X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,rostedt@goodmis.org,:::::::::::::::::::::,RULES_HIT:41:152:355:379:599:800:960:973:988:989:1260:1277:1311:1313:1314:1345:1359:1437:1513:1515:1516:1518:1521:1534:1541:1593:1594:1711:1730:1747:1777:1792:2393:2553:2559:2562:3138:3139:3140:3141:3142:3353:3865:3868:3873:5007:6120:7652:7875:7903:10004:10400:10450:10455:10848:11026:11232:11658:11914:12043:12296:12297:12438:12555:12663:12895:12986:13069:13255:13311:13357:14721:14777:19904:19999:21080:21324:21433:21627:21740:21990:30026:30039:30054:30090,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:16,LUA_SUMMARY:none X-HE-Tag: fuel06_65ff284cde013 X-Filterd-Recvd-Size: 3182 Received: from [100.68.140.46] (unknown [206.121.37.170]) (Authenticated sender: rostedt@goodmis.org) by omf05.hostedemail.com (Postfix) with ESMTPA; Fri, 7 Feb 2020 21:08:20 +0000 (UTC) Date: Fri, 07 Feb 2020 16:07:58 -0500 User-Agent: K-9 Mail for Android In-Reply-To: <20200207205656.61938-2-joel@joelfernandes.org> References: <20200207205656.61938-1-joel@joelfernandes.org> <20200207205656.61938-2-joel@joelfernandes.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT Subject: Re: [RFC 1/3] Revert "tracepoint: Use __idx instead of idx in DO_TRACE macro to make it unique" To: "Joel Fernandes (Google)" , linux-kernel@vger.kernel.org CC: Greg Kroah-Hartman , "Gustavo A. R. Silva" , Ingo Molnar , Richard Fontana , Thomas Gleixner , "Paul E. McKenney" , Josh Triplett , Mathieu Desnoyers , Lai Jiangshan From: Steven Rostedt Message-ID: <13EE7A4B-38E7-4A41-AE42-C03B1898E947@goodmis.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [Top posting as I'm replying from an airport gate, from my phone ] Although you have a cover letter explaining the revert, each patch must be standalone, otherwise looking at git history won't have any explanation for the revert. -- Steve On February 7, 2020 3:56:54 PM EST, "Joel Fernandes (Google)" wrote: >This reverts commit 0c7a52e4d4b5c4d35b31f3c3ad32af814f1bf491. > >Signed-off-by: Joel Fernandes (Google) >--- > include/linux/tracepoint.h | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > >diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h >index 1fb11daa5c533..59463c90fdc3d 100644 >--- a/include/linux/tracepoint.h >+++ b/include/linux/tracepoint.h >@@ -164,7 +164,7 @@ static inline struct tracepoint >*tracepoint_ptr_deref(tracepoint_ptr_t *p) > struct tracepoint_func *it_func_ptr; \ > void *it_func; \ > void *__data; \ >- int __maybe_unused __idx = 0; \ >+ int __maybe_unused idx = 0; \ > \ > if (!(cond)) \ > return; \ >@@ -180,7 +180,7 @@ static inline struct tracepoint >*tracepoint_ptr_deref(tracepoint_ptr_t *p) > * doesn't work from the idle path. \ > */ \ > if (rcuidle) { \ >- __idx = srcu_read_lock_notrace(&tracepoint_srcu);\ >+ idx = srcu_read_lock_notrace(&tracepoint_srcu); \ > rcu_irq_enter_irqson(); \ > } \ > \ >@@ -196,7 +196,7 @@ static inline struct tracepoint >*tracepoint_ptr_deref(tracepoint_ptr_t *p) > \ > if (rcuidle) { \ > rcu_irq_exit_irqson(); \ >- srcu_read_unlock_notrace(&tracepoint_srcu, __idx);\ >+ srcu_read_unlock_notrace(&tracepoint_srcu, idx);\ > } \ > \ > preempt_enable_notrace(); \ -- Sent from my Android device with K-9 Mail. Please excuse my brevity and top posting.