---

yaml --- r: 257219 b: refs/heads/master c: 2597085 h: refs/heads/master i: 257217: d37d782 257215: 7eaf2a9 v: v3
git-mirror · Jul 12, 2011 · a420adb · a420adb
1 parent 445ec4d
commit a420adb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7fece83235a59b15d75d6c8ef2225c24abd4505b
+refs/heads/master: 25970852280c9d5fb2de899769880d3e97332baa
diff --git a/trunk/arch/x86/kernel/apic/apic.c b/trunk/arch/x86/kernel/apic/apic.c
@@ -1429,7 +1429,7 @@ void enable_x2apic(void)
 	rdmsr(MSR_IA32_APICBASE, msr, msr2);
 	if (!(msr & X2APIC_ENABLE)) {
 		printk_once(KERN_INFO "Enabling x2apic\n");
-		wrmsr(MSR_IA32_APICBASE, msr | X2APIC_ENABLE, 0);
+		wrmsr(MSR_IA32_APICBASE, msr | X2APIC_ENABLE, msr2);
 	}
 }
 #endif /* CONFIG_X86_X2APIC */