leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Glauber Costa 2008-03-27 14:06:04 -03:00 committed by Ingo Molnar
parent ecaa6c9de7
commit 8be9ac8505
3 changed files with 5 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/asm-x86/smp.h
View File

@ -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)

12
include/asm-x86/smp_32.h
View File

@ -1,12 +0,0 @@
#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

11
include/asm-x86/smp_64.h
View File

@ -1,11 +0,0 @@
#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