x86: APIC: Remove apic_write_around(); use alternatives, merge fix

On Fri, Jul 18, 2008 at 02:03:48PM -0700, Ingo Molnar wrote:
>
> * Yinghai Lu <yhlu.kernel@gmail.com> wrote:
>
> > > git merge tip/x86/x2apic
> > CONFLICT (content): Merge conflict in arch/x86/kernel/Makefile
> > CONFLICT (content): Merge conflict in arch/x86/kernel/paravirt.c
> > CONFLICT (content): Merge conflict in arch/x86/kernel/smpboot.c
> > CONFLICT (content): Merge conflict in arch/x86/kernel/vmi_32.c
> > CONFLICT (content): Merge conflict in arch/x86/xen/enlighten.c
> > CONFLICT (content): Merge conflict in include/asm-x86/apic.h
> > CONFLICT (content): Merge conflict in include/asm-x86/paravirt.h
>
> that's due to the changes in tip/x86/apic and in tip/x86/uv.
>
> ok, i've just merged x86/apic into x86/x2apic and x86/uv as well, and
> pushed out the result.
>
> Note: it's a first raw merge and completely untested. It will now merge
> cleanly into tip/master. There are probably a few details missing.

Ingo, thanks for doing this. While I was testing my merge changes, you posted
yours... anyhow we need this piece, which is missing from your merge.

Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: Yinghai Lu <yhlu.kernel@gmail.com>
Cc: "Maciej W. Rozycki" <macro@linux-mips.org>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Zachary Amsden <zach@vmware.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
index dcb897f22aa29b7e0ed8875d48c9d258b4d00478..8728f54a93d8dd4f02e7f40aadbe9daf26401018 100644 (file)
--- a/arch/x86/kernel/apic_32.c
+++ b/arch/x86/kernel/apic_32.c
@@ -174,8 +174,8 @@ u32 safe_xapic_wait_icr_idle(void)
 
 void xapic_icr_write(u32 low, u32 id)
 {
-       apic_write_around(APIC_ICR2, SET_APIC_DEST_FIELD(id));
-       apic_write_around(APIC_ICR, low);
+       apic_write(APIC_ICR2, SET_APIC_DEST_FIELD(id));
+       apic_write(APIC_ICR, low);
 }
 
 u64 xapic_icr_read(void)
@@ -191,7 +191,6 @@ u64 xapic_icr_read(void)
 static struct apic_ops xapic_ops = {
        .read = native_apic_mem_read,
        .write = native_apic_mem_write,
-       .write_atomic = native_apic_mem_write_atomic,
        .icr_read = xapic_icr_read,
        .icr_write = xapic_icr_write,
        .wait_icr_idle = xapic_wait_icr_idle,

diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index 46e612408aca78271f5bce2c59776daa9975680a..a850bc63fb1c2578f384383a9831243c5f4fc93a 100644 (file)
--- a/arch/x86/kernel/apic_64.c
+++ b/arch/x86/kernel/apic_64.c
@@ -167,7 +167,6 @@ u64 xapic_icr_read(void)
 static struct apic_ops xapic_ops = {
        .read = native_apic_mem_read,
        .write = native_apic_mem_write,
-       .write_atomic = native_apic_mem_write_atomic,
        .icr_read = xapic_icr_read,
        .icr_write = xapic_icr_write,
        .wait_icr_idle = xapic_wait_icr_idle,
@@ -206,7 +205,6 @@ u64 x2apic_icr_read(void)
 static struct apic_ops x2apic_ops = {
        .read = native_apic_msr_read,
        .write = native_apic_msr_write,
-       .write_atomic = native_apic_msr_write,
        .icr_read = x2apic_icr_read,
        .icr_write = x2apic_icr_write,
        .wait_icr_idle = x2apic_wait_icr_idle,