Messages in this thread | | | Date | Fri, 18 Jul 2008 14:13:52 -0700 | From | "Yinghai Lu" <> | Subject | Re: [PATCH] x86: APIC: Remove apic_write_around(); use alternatives |
| |
On Fri, Jul 18, 2008 at 2:03 PM, Ingo Molnar <mingo@elte.hu> 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. > > 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.
CC arch/x86/kernel/apic_64.o arch/x86/kernel/apic_64.c:170: error: unknown field 'write_atomic' specified in initializer arch/x86/kernel/apic_64.c:170: error: 'native_apic_mem_write_atomic' undeclared here (not in a function) arch/x86/kernel/apic_64.c:209: error: unknown field 'write_atomic' specified in initializer arch/x86/kernel/apic_64.c:209: warning: initialization from incompatible pointer type make[1]: *** [arch/x86/kernel/apic_64.o] Error 1 make: *** [arch/x86/kernel] Error 2
YH
| |