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

Commit 42068829 authored by Glauber Costa's avatar Glauber Costa Committed by Ingo Molnar
Browse files

x86: move trampoline arrays extern definition to smp.h 



In here, they can serve both architectures

Signed-off-by: default avatarGlauber Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 89b08200

arch/x86/kernel/smpboot_32.c

+0 −6
Original line number Diff line number Diff line
@@ -73,12 +73,6 @@ EXPORT_PER_CPU_SYMBOL(x86_cpu_to_apicid); 


u8 apicid_2_node[MAX_APICID];



/*

 * Trampoline 80x86 program as an array.

 */



extern const unsigned char trampoline_data [];

extern const unsigned char trampoline_end  [];

static unsigned char *trampoline_base;



static void map_cpu_to_logical_apicid(void);

arch/x86/kernel/smpboot_64.c

+0 −7
Original line number Diff line number Diff line
@@ -63,13 +63,6 @@ 
/* Set when the idlers are all forked */

int smp_threads_ready;



/*

 * Trampoline 80x86 program as an array.

 */



extern const unsigned char trampoline_data[];

extern const unsigned char trampoline_end[];



/* State of each CPU */

DEFINE_PER_CPU(int, cpu_state) = { 0 };

include/asm-x86/smp.h

+6 −0
Original line number Diff line number Diff line
@@ -9,6 +9,12 @@ extern cpumask_t cpu_callout_map; 
extern int smp_num_siblings;

extern unsigned int num_processors;



/*

 * Trampoline 80x86 program as an array.

 */

extern const unsigned char trampoline_data [];

extern const unsigned char trampoline_end  [];



struct smp_ops {

	void (*smp_prepare_boot_cpu)(void);

	void (*smp_prepare_cpus)(unsigned max_cpus);