Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6bc4029 authored by Glauber de Oliveira Costa's avatar Glauber de Oliveira Costa Committed by Ingo Molnar
Browse files

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: default avatarGlauber Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 4370ee4d

arch/x86/kernel/acpi/boot.c

+4 −0
Original line number Diff line number Diff line
@@ -40,6 +40,10 @@ 
#include <asm/io.h>

#include <asm/mpspec.h>



#ifdef CONFIG_X86_LOCAL_APIC

# include <mach_apic.h>

#endif



static int __initdata acpi_force = 0;



#ifdef	CONFIG_ACPI

arch/x86/kernel/mpparse_64.c

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ 
#include <asm/proto.h>

#include <asm/acpi.h>



#include <mach_apic.h>



/* Have we found an MP table */

int smp_found_config;

unsigned int __cpuinitdata maxcpus = NR_CPUS;

arch/x86/kernel/smpboot.c

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 
#include <asm/cpu.h>

#include <asm/numa.h>



#include <mach_apic.h>



/* Number of siblings per CPU package */

int smp_num_siblings = 1;

EXPORT_SYMBOL(smp_num_siblings);

arch/x86/kernel/smpboot_64.c

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ 
#include <asm/numa.h>



#include <mach_wakecpu.h>

#include <mach_apic.h>

#include <smpboot_hooks.h>



/* Set when the idlers are all forked */

arch/x86/vdso/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ $(obj)/%.so: $(obj)/%.so.dbg FORCE 


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