Merge branch 'master' into for-next

2010-08-04 15:14:38 +02:00
parent 73b2c7165b 3a09b1be53
commit d790d4d583
1744 changed files with 34752 additions and 212871 deletions
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -921,7 +921,7 @@ void disable_local_APIC(void)
 	unsigned int value;

 	/* APIC hasn't been mapped yet */
-	if (!apic_phys)
+	if (!x2apic_mode && !apic_phys)
 		return;

 	clear_local_APIC();