Re: [PATCH] x86: APIC: Remove apic_write_around(); use alternatives

[Ingo Molnar]

* Yinghai Lu <yhlu.kernel@xxxxxxxxx> 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.

The smp-alternatives based trick that Maciej applied for write-around 
can stay in the mem_apic_* methods - modern APICs do not need any 
workaround in this area and can just use apic_ops.

> also please apply
> Fix VMI apic_ops.
> from Suresh
> 
> to x2apic

done.

	Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/