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

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

x86: merge smp_32.h and smp_64.h into smp.h 



Merge what's left from smp_32.h and smp_64.h into smp.h
By now, they're basically extern definitions.

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

include/asm-x86/smp.h

+5 −6
Original line number Diff line number Diff line
@@ -19,6 +19,11 @@ 
#include <asm/thread_info.h>



extern cpumask_t cpu_callout_map;

extern cpumask_t cpu_initialized;

extern cpumask_t cpu_callin_map;



extern void (*mtrr_hook)(void);

extern void zap_low_mappings(void);



extern int smp_num_siblings;

extern unsigned int num_processors;
@@ -161,12 +166,6 @@ extern int safe_smp_processor_id(void); 
#define stack_smp_processor_id() 	0

#endif



#ifdef CONFIG_X86_32

# include "smp_32.h"

#else

# include "smp_64.h"

#endif



#ifdef CONFIG_X86_LOCAL_APIC



static inline int logical_smp_processor_id(void)

include/asm-x86/smp_32.h

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
#ifndef __ASM_SMP_H

#define __ASM_SMP_H



#ifndef __ASSEMBLY__



extern cpumask_t cpu_callin_map;



extern void (*mtrr_hook)(void);

extern void zap_low_mappings(void);



#endif /* !ASSEMBLY */

#endif

include/asm-x86/smp_64.h

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
#ifndef __ASM_SMP_H

#define __ASM_SMP_H



extern cpumask_t cpu_initialized;

extern cpumask_t cpu_callin_map;



extern int smp_call_function_mask(cpumask_t mask, void (*func)(void *),

				  void *info, int wait);



#endif