Merge branch 'linus' into x86/x2apic

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/kernel/Makefile
Simple merge

diff --cc arch/x86/kernel/acpi/boot.c
Simple merge

diff --cc arch/x86/kernel/apic_32.c
Simple merge

diff --cc arch/x86/kernel/apic_64.c
Simple merge

diff --cc arch/x86/kernel/cpu/common_64.c
Simple merge

diff --cc arch/x86/kernel/mpparse.c
Simple merge

diff --cc arch/x86/kernel/paravirt.c
Simple merge

diff --cc arch/x86/kernel/setup.c
Simple merge

diff --cc arch/x86/kernel/smpboot.c
index a4f2d8f06e4824f2f7f038429c72241bcf2914ab,4b53a647bc0affd6bbfc3a47d7a57419b8449f24..52eb1484a48ac1d106c2c6920d0ff309f35d5d42
--- 1/arch/x86/kernel/smpboot.c
--- 2/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@@ -579,11 -579,13 +579,11 @@@ wakeup_secondary_cpu(int logical_apicid
        int maxlvt;
  
        /* Target chip */
 -      apic_write(APIC_ICR2, SET_APIC_DEST_FIELD(logical_apicid));
 -
        /* Boot on the stack */
        /* Kick the second */
 -      apic_write(APIC_ICR, APIC_DM_NMI | APIC_DEST_LOGICAL);
 +      apic_icr_write(APIC_DM_NMI | APIC_DEST_LOGICAL, logical_apicid);
  
-       Dprintk("Waiting for send to finish...\n");
+       pr_debug("Waiting for send to finish...\n");
        send_status = safe_apic_wait_icr_idle();
  
        /*
@@@ -637,21 -639,25 +637,21 @@@ wakeup_secondary_cpu(int phys_apicid, u
        /*
         * Send IPI
         */
 -      apic_write(APIC_ICR,
 -                 APIC_INT_LEVELTRIG | APIC_INT_ASSERT | APIC_DM_INIT);
 +      apic_icr_write(APIC_INT_LEVELTRIG | APIC_INT_ASSERT | APIC_DM_INIT,
 +                     phys_apicid);
  
-       Dprintk("Waiting for send to finish...\n");
+       pr_debug("Waiting for send to finish...\n");
        send_status = safe_apic_wait_icr_idle();
  
        mdelay(10);
  
-       Dprintk("Deasserting INIT.\n");
+       pr_debug("Deasserting INIT.\n");
  
        /* Target chip */
 -      apic_write(APIC_ICR2, SET_APIC_DEST_FIELD(phys_apicid));
 -
        /* Send IPI */
 -      apic_write(APIC_ICR, APIC_INT_LEVELTRIG | APIC_DM_INIT);
 +      apic_icr_write(APIC_INT_LEVELTRIG | APIC_DM_INIT, phys_apicid);
  
-       Dprintk("Waiting for send to finish...\n");
+       pr_debug("Waiting for send to finish...\n");
        send_status = safe_apic_wait_icr_idle();
  
        mb();

diff --cc arch/x86/xen/enlighten.c
index e4d1459a63dfc635a642fd27446b326ba5440c16,194bbd6e32410dd4c00c1aa360bca80b312d41b1..c910345860c3d29a36bef692864d02b52f47cd94
--- 1/arch/x86/xen/enlighten.c
--- 2/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@@ -33,9 -33,9 +33,10 @@@
  #include <xen/interface/sched.h>
  #include <xen/features.h>
  #include <xen/page.h>
+ #include <xen/hvc-console.h>
  
  #include <asm/paravirt.h>
 +#include <asm/apic.h>
  #include <asm/page.h>
  #include <asm/xen/hypercall.h>
  #include <asm/xen/hypervisor.h>

diff --cc drivers/pci/intel-iommu.c
Simple merge

diff --cc include/asm-x86/apic.h
Simple merge

diff --cc include/asm-x86/paravirt.h
Simple merge

diff --cc include/asm-x86/smp.h
Simple merge