Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753344AbdIGASe (ORCPT ); Wed, 6 Sep 2017 20:18:34 -0400 Received: from mail-pg0-f43.google.com ([74.125.83.43]:35541 "EHLO mail-pg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752719AbdIGASN (ORCPT ); Wed, 6 Sep 2017 20:18:13 -0400 X-Google-Smtp-Source: ADKCNb5hcuDWh0fyBPp7sMpTMsDLfr4d1Ui97Q9N6luehxy85pEAEFFcj1IOmyLh/DRy/dTknVnW2Q== From: Joel Fernandes To: linux-kernel@vger.kernel.org Cc: Joel Fernandes , Steven Rostedt , Peter Zijlstra , kernel-team@android.com, Ingo Molnar Subject: [PATCH RFC v4 3/3] ftrace: Use correct config option for preemption debug Date: Wed, 6 Sep 2017 17:17:52 -0700 Message-Id: <20170907001752.27015-4-joelaf@google.com> X-Mailer: git-send-email 2.14.1.581.gf28d330327-goog In-Reply-To: <20170907001752.27015-1-joelaf@google.com> References: <20170907001752.27015-1-joelaf@google.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1216 Lines: 35 I notice that CONFIG_PREEMPT_DEBUG doesn't exist, though this code uses it. I think it wants CONFIG_DEBUG_PREEMPT. Replace it with the same. Cc: Steven Rostedt Cc: Peter Zijlstra Cc: kernel-team@android.com Signed-off-by: Joel Fernandes --- 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 5790ba7a85bd..768e49b8c80f 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.581.gf28d330327-goog