From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751683AbdHaPkj (ORCPT ); Thu, 31 Aug 2017 11:40:39 -0400 Received: from thorn.bewilderbeest.net ([71.19.156.171]:38614 "EHLO thorn.bewilderbeest.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751511AbdHaPki (ORCPT ); Thu, 31 Aug 2017 11:40:38 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 thorn.bewilderbeest.net BDAB58045F Date: Thu, 31 Aug 2017 10:40:36 -0500 From: Zev Weiss To: Steven Rostedt Cc: Ingo Molnar , linux-kernel@vger.kernel.org Subject: Re: [PATCH] ftrace: fix debug config symbol in stack_tracer_{en,dis}able Message-ID: <20170831154036.4xldyakmmhuts5x7@hatter.bewilderbeest.net> References: <20170831070108.24911-1-zev@bewilderbeest.net> <20170831095407.0192c343@gandalf.local.home> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <20170831095407.0192c343@gandalf.local.home> User-Agent: NeoMutt/20170714 (1.8.3) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Aug 31, 2017 at 08:54:07AM CDT, Steven Rostedt wrote: >On Thu, 31 Aug 2017 02:01:08 -0500 >Zev Weiss wrote: > >> Hello, >> >> It appears stack_tracer_disable()/stack_tracer_enable() have been >> using the wrong name for the config symbol to enable their >> preempt-debugging checks, which the patch below should fix. (Noticed >> when I made the same mistake attempting to grep for >> CONFIG_DEBUG_PREEMPT and got two results instead of zero). >> >> >> Zev Weiss > >Can you resend with a proper change log (no "Hello") and add a >Signed-off-by tag? > >Thanks! > >-- Steve > Ah, sorry about that -- misunderstood what my 'git send-email' flags were doing...hopefully the below works better. Zev >>From e916675c65ffcfb953f79c7243e8508efcf13aeb Mon Sep 17 00:00:00 2001 From: Zev Weiss Date: Wed, 30 Aug 2017 05:36:38 -0500 Subject: [PATCH] ftrace: fix debug config symbol in stack_tracer_{en,dis}able stack_tracer_disable()/stack_tracer_enable() had been using the wrong name for the config symbol to enable their preempt-debugging checks -- fix with a word swap. Signed-off-by: Zev Weiss --- include/linux/ftrace.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index 6383115e9d2c..2e028854bac7 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h @@ -307,7 +307,7 @@ DECLARE_PER_CPU(int, disable_stack_tracer); static inline void stack_tracer_disable(void) { /* Preemption or interupts must be disabled */ - if (IS_ENABLED(CONFIG_PREEMPT_DEBUG)) + if (IS_ENABLED(CONFIG_DEBUG_PREEMPT)) WARN_ON_ONCE(!preempt_count() || !irqs_disabled()); this_cpu_inc(disable_stack_tracer); } @@ -320,7 +320,7 @@ static inline void stack_tracer_disable(void) */ static inline void stack_tracer_enable(void) { - if (IS_ENABLED(CONFIG_PREEMPT_DEBUG)) + if (IS_ENABLED(CONFIG_DEBUG_PREEMPT)) WARN_ON_ONCE(!preempt_count() || !irqs_disabled()); this_cpu_dec(disable_stack_tracer); } -- 2.14.1