From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 22 Jul 2008 07:06:21 +0000 (+0200)
Subject: Merge branch 'linus' into x86/x2apic
X-Git-Tag: v3.0~12858^2^2^3~6^2~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=76c3bb15d6786a0b8da0ad0090e0c9c3672fc08b;p=platform%2Fkernel%2Flinux-amlogic.git

Merge branch 'linus' into x86/x2apic
---

76c3bb15d6786a0b8da0ad0090e0c9c3672fc08b
diff --cc arch/x86/kernel/smpboot.c
index a4f2d8f,4b53a64..52eb148
--- a/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 e4d1459,194bbd6..c910345
--- a/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>