Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMel Gorman <mgorman@suse.de>2017-11-15 14:39:17 +0000
committerMel Gorman <mgorman@suse.de>2017-11-15 14:39:20 +0000
commitc64f035adf6e42a59a2e0378e6a107aef1cc29f9 (patch)
treee576b896a504e4cdff18b31e4085b6757bf192a5
parent15d1407f40be64c1148478ff59b41967195eb0e1 (diff)
x86: Use lockdep to assert IRQs are disabled/enabled
(bnc#1068202 Avoid irqs_disabled debugging checks in fast paths). suse-commit: b1ab652d6b0d7e36aad251db7f700edcb4dafb03
-rw-r--r--arch/x86/entry/common.c4
-rw-r--r--arch/x86/kernel/smpboot.c2
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c
index cdefcfdd9e63..58e639190aab 100644
--- a/arch/x86/entry/common.c
+++ b/arch/x86/entry/common.c
@@ -183,9 +183,7 @@ __visible inline void prepare_exit_to_usermode(struct pt_regs *regs)
struct thread_info *ti = current_thread_info();
u32 cached_flags;
- if (IS_ENABLED(CONFIG_PROVE_LOCKING) && WARN_ON(!irqs_disabled()))
- local_irq_disable();
-
+ lockdep_assert_irqs_disabled();
lockdep_sys_exit();
cached_flags = READ_ONCE(ti->flags);
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 4899684fe181..4949ab5b8f34 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -1097,7 +1097,7 @@ int native_cpu_up(unsigned int cpu, struct task_struct *tidle)
unsigned long flags;
int err;
- WARN_ON(irqs_disabled());
+ lockdep_assert_irqs_enabled();
pr_debug("++++++++++++++++++++=_---CPU UP %u\n", cpu);