From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751034AbdHaHKa (ORCPT ); Thu, 31 Aug 2017 03:10:30 -0400 Received: from thorn.bewilderbeest.net ([71.19.156.171]:38896 "EHLO thorn.bewilderbeest.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750783AbdHaHK2 (ORCPT ); Thu, 31 Aug 2017 03:10:28 -0400 X-Greylist: delayed 504 seconds by postgrey-1.27 at vger.kernel.org; Thu, 31 Aug 2017 03:10:28 EDT DKIM-Filter: OpenDKIM Filter v2.11.0 thorn.bewilderbeest.net 04CC28045F From: Zev Weiss To: Steven Rostedt Cc: Ingo Molnar , linux-kernel@vger.kernel.org, Zev Weiss Subject: [PATCH] ftrace: fix debug config symbol in stack_tracer_{en,dis}able Date: Thu, 31 Aug 2017 02:01:08 -0500 Message-Id: <20170831070108.24911-1-zev@bewilderbeest.net> X-Mailer: git-send-email 2.14.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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