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

Conflicts:
	arch/x86/kernel/head64.c
	arch/x86/mm/mmap.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>

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;