| Date | Wed, 19 Mar 2008 23:56:47 -0700 | From | "Yinghai Lu" <> | Subject | Re: [PATCH 58/79] [PATCH] include mach_apic.h in smpboot_64.c and smpboot.c |
| |
On Wed, Mar 19, 2008 at 10:25 AM, Glauber de Oliveira Costa <gcosta@redhat.com> wrote: > From: Glauber Costa <gcosta@redhat.com> > > After the inclusion, a lot of files needs fixing for conflicts, > some of them in the headers themselves, to accomodate for both > i386 and x86_64 versions. > > Signed-off-by: Glauber Costa <gcosta@redhat.com> > --- > arch/x86/kernel/acpi/boot.c | 2 ++ > arch/x86/kernel/mpparse_64.c | 2 ++ > arch/x86/kernel/smpboot.c | 2 ++ > arch/x86/kernel/smpboot_64.c | 1 + > arch/x86/vdso/Makefile | 2 +- > include/asm-x86/apic.h | 1 - > include/asm-x86/apicdef.h | 6 ------ > include/asm-x86/mach-default/mach_apic.h | 11 +++++++++++ > include/asm-x86/mach-default/mach_apicdef.h | 5 +++++ > include/asm-x86/smp_64.h | 9 +-------- > 10 files changed, 25 insertions(+), 16 deletions(-)
please don't.
before this patch include/asm-x86/mach_apic.h is only for x86_64 only include/asm-x86/mach-default/mach_apic.h is for i386 only.
and both have __ASM_MACH_APIC_H defined.
may need another name?
YH
|