Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Yejune Deng <yejune.deng@gmail.com>
To:     tglx@linutronix.de, peterz@infradead.org, frederic@kernel.org,
        mingo@kernel.org, keescook@chromium.org, dave@stgolabs.net
Cc:     linux-kernel@vger.kernel.org, Yejune Deng <yejunedeng@gmail.com>
Subject: [PATCH] softirq: Remove the unnecessary CONFIG_TRACE_IRQFLAGS
Date:   Wed,  2 Jun 2021 15:34:42 +0800
Message-Id: <1622619282-12077-1-git-send-email-yejunedeng@gmail.com>
Precedence: bulk

The local_irq_enable() and local_irq_disable() had two definitions that
include CONFIG_TRACE_IRQFLAGS or not.

Signed-off-by: Yejune Deng <yejunedeng@gmail.com>
---
 kernel/softirq.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/kernel/softirq.c b/kernel/softirq.c
index 4992853..a81d804 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -362,9 +362,7 @@ void __local_bh_enable_ip(unsigned long ip, unsigned int cnt)
 {
 	WARN_ON_ONCE(in_irq());
 	lockdep_assert_irqs_enabled();
-#ifdef CONFIG_TRACE_IRQFLAGS
 	local_irq_disable();
-#endif
 	/*
 	 * Are softirqs going to be turned on now:
 	 */
@@ -385,9 +383,7 @@ void __local_bh_enable_ip(unsigned long ip, unsigned int cnt)
 	}
 
 	preempt_count_dec();
-#ifdef CONFIG_TRACE_IRQFLAGS
 	local_irq_enable();
-#endif
 	preempt_check_resched();
 }
 EXPORT_SYMBOL(__local_bh_enable_ip);
-- 
2.7.4