commit f6bc40290964b5fcb48c226ccafa4b7536d62663
author Glauber de Oliveira Costa <gcosta@redhat.com> Wed Mar 19 14:25:53 2008 -0300
committer Ingo Molnar <mingo@elte.hu> Thu Apr 17 17:41:02 2008 +0200
tree 4b59929aaef9fa73a909b1700726074ef98a134e
parent 4370ee4d3b7772158174bf6f0bf08359c2ccf54b

x86: include mach_apic.h in smpboot_64.c and smpboot.c

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.

[ mingo@elte.hu: build fix ]

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

arch/x86/vdso/Makefile

diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
index 0a8f474..17a6b05 100644
--- a/arch/x86/vdso/Makefile
+++ b/arch/x86/vdso/Makefile
@@ -39,7 +39,7 @@
 
 CFL := $(PROFILING) -mcmodel=small -fPIC -g0 -O2 -fasynchronous-unwind-tables -m64
 
-$(vobjs): KBUILD_CFLAGS = $(CFL)
+$(vobjs): KBUILD_CFLAGS += $(CFL)
 
 targets += vdso-syms.lds
 obj-$(VDSO64-y)			+= vdso-syms.lds