From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 23 Jul 2011 00:02:07 +0000 (-0700)
Subject: Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.1-rc1~294
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=2c9e88a1085b3183e5f92170a74980e5654f817b;hp=-c

Merge branch 'x86-apic-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, ioapic: Print IR_IO_APIC_route_entry when IR is enabled
  x86, ioapic: Print IRTE when IR is enabled
  x86, x2apic: Preserve high 32-bits of IA32_APIC_BASE MSR
  x86, ioapic: Also print Dest field
  x86, ioapic: Format clean up for IOAPIC output
  x86: print APIC data a little later during boot
---

2c9e88a1085b3183e5f92170a74980e5654f817b
diff --combined arch/x86/kernel/apic/apic.c
index a7aed48356ef,f7b0c7a1dfaa..9498b8445186
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@@ -27,7 -27,6 +27,7 @@@
  #include <linux/syscore_ops.h>
  #include <linux/delay.h>
  #include <linux/timex.h>
 +#include <linux/i8253.h>
  #include <linux/dmar.h>
  #include <linux/init.h>
  #include <linux/cpu.h>
@@@ -40,6 -39,7 +40,6 @@@
  #include <asm/pgalloc.h>
  #include <asm/atomic.h>
  #include <asm/mpspec.h>
 -#include <asm/i8253.h>
  #include <asm/i8259.h>
  #include <asm/proto.h>
  #include <asm/apic.h>
@@@ -48,7 -48,6 +48,7 @@@
  #include <asm/hpet.h>
  #include <asm/idle.h>
  #include <asm/mtrr.h>
 +#include <asm/time.h>
  #include <asm/smp.h>
  #include <asm/mce.h>
  #include <asm/tsc.h>
@@@ -1430,7 -1429,7 +1430,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 */