From a420adbafada2b185c065453785f8d421e9df103 Mon Sep 17 00:00:00 2001 From: Naga Chumbalkar Date: Tue, 12 Jul 2011 05:59:07 +0000 Subject: [PATCH] --- yaml --- r: 257219 b: refs/heads/master c: 25970852280c9d5fb2de899769880d3e97332baa h: refs/heads/master i: 257217: d37d7821c36332cc4edf830b63146ec745fbc5ca 257215: 7eaf2a9f66b0039c4eb244ab3ab48835269e2ae9 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/apic/apic.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6428732c869d..c3df1a620229 100644 --- 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 index b9338b8cf420..f7b0c7a1dfaa 100644 --- 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 */