diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2009-02-12 15:30:48 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2009-02-12 17:11:58 -0500 |
commit | 34b0900d323122113683685b200aae9f9b75e63b (patch) | |
tree | a7ebd50755ae7321e89a4e5a0b64e4a5a7de0dc4 | |
parent | d85cf93da66977dbc645352be1b2084a659d8a0b (diff) |
x86: warn if arch_flush_lazy_mmu_cpu is called in preemptible context
Impact: Catch cases where lazy MMU state is active in a preemtible context
arch_flush_lazy_mmu_cpu() has been changed to disable preemption so
the checks in enter/leave will never trigger. Put the preemtible()
check into arch_flush_lazy_mmu_cpu() to catch such cases.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r-- | arch/x86/kernel/paravirt.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c index dcba6c567a2a..c6520a4e85d4 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c | |||
@@ -273,6 +273,7 @@ void arch_flush_lazy_mmu_mode(void) | |||
273 | preempt_disable(); | 273 | preempt_disable(); |
274 | 274 | ||
275 | if (paravirt_get_lazy_mode() == PARAVIRT_LAZY_MMU) { | 275 | if (paravirt_get_lazy_mode() == PARAVIRT_LAZY_MMU) { |
276 | WARN_ON(preempt_count() == 1); | ||
276 | arch_leave_lazy_mmu_mode(); | 277 | arch_leave_lazy_mmu_mode(); |
277 | arch_enter_lazy_mmu_mode(); | 278 | arch_enter_lazy_mmu_mode(); |
278 | } | 279 | } |
@@ -285,6 +286,7 @@ void arch_flush_lazy_cpu_mode(void) | |||
285 | preempt_disable(); | 286 | preempt_disable(); |
286 | 287 | ||
287 | if (paravirt_get_lazy_mode() == PARAVIRT_LAZY_CPU) { | 288 | if (paravirt_get_lazy_mode() == PARAVIRT_LAZY_CPU) { |
289 | WARN_ON(preempt_count() == 1); | ||
288 | arch_leave_lazy_cpu_mode(); | 290 | arch_leave_lazy_cpu_mode(); |
289 | arch_enter_lazy_cpu_mode(); | 291 | arch_enter_lazy_cpu_mode(); |
290 | } | 292 | } |