Merge branch 'linus' into x86/mm to pick up fixes and to fix conflicts

[people/arne_f/kernel.git] / arch / x86 / include / asm / mmu_context.h

diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
index 14b3cdccf4f9074b9d0b5db32799eeb51072e511..d25d9f4abb15a1e06e83e6e4ebac1ef9f2c70c04 100644 (file)
--- a/arch/x86/include/asm/mmu_context.h
+++ b/arch/x86/include/asm/mmu_context.h
@@ -304,7 +304,7 @@ static inline unsigned long __get_current_cr3_fast(void)
                cr3 |= this_cpu_read(cpu_tlbstate.loaded_mm_asid);
 
        /* For now, be very restrictive about when this can be called. */
-       VM_WARN_ON(in_nmi() || !in_atomic());
+       VM_WARN_ON(in_nmi() || preemptible());
 
        VM_BUG_ON(cr3 != __read_cr3());
        return cr3;