mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-22 10:34:55 +08:00
x86: merge includes in smp.h
move all include directives from smp_{32,64}.h to smp.h. Signed-off-by: Glauber Costa <gcosta@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
c1fa6c977e
commit
b23dab08fa
@ -5,6 +5,19 @@
|
||||
#include <linux/init.h>
|
||||
#include <asm/percpu.h>
|
||||
|
||||
/*
|
||||
* We need the APIC definitions automatically as part of 'smp.h'
|
||||
*/
|
||||
#ifdef CONFIG_X86_LOCAL_APIC
|
||||
# include <asm/mpspec.h>
|
||||
# include <asm/apic.h>
|
||||
# ifdef CONFIG_X86_IO_APIC
|
||||
# include <asm/io_apic.h>
|
||||
# endif
|
||||
#endif
|
||||
#include <asm/pda.h>
|
||||
#include <asm/thread_info.h>
|
||||
|
||||
extern cpumask_t cpu_callout_map;
|
||||
|
||||
extern int smp_num_siblings;
|
||||
|
@ -2,19 +2,6 @@
|
||||
#define __ASM_SMP_H
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
#include <linux/cpumask.h>
|
||||
#include <linux/init.h>
|
||||
|
||||
/*
|
||||
* We need the APIC definitions automatically as part of 'smp.h'
|
||||
*/
|
||||
#ifdef CONFIG_X86_LOCAL_APIC
|
||||
# include <asm/mpspec.h>
|
||||
# include <asm/apic.h>
|
||||
# ifdef CONFIG_X86_IO_APIC
|
||||
# include <asm/io_apic.h>
|
||||
# endif
|
||||
#endif
|
||||
|
||||
extern cpumask_t cpu_callin_map;
|
||||
|
||||
|
@ -1,22 +1,6 @@
|
||||
#ifndef __ASM_SMP_H
|
||||
#define __ASM_SMP_H
|
||||
|
||||
#include <linux/cpumask.h>
|
||||
#include <linux/init.h>
|
||||
|
||||
/*
|
||||
* We need the APIC definitions automatically as part of 'smp.h'
|
||||
*/
|
||||
#ifdef CONFIG_X86_LOCAL_APIC
|
||||
# include <asm/mpspec.h>
|
||||
# include <asm/apic.h>
|
||||
# ifdef CONFIG_X86_IO_APIC
|
||||
# include <asm/io_apic.h>
|
||||
# endif
|
||||
#endif
|
||||
#include <asm/pda.h>
|
||||
#include <asm/thread_info.h>
|
||||
|
||||
extern cpumask_t cpu_initialized;
|
||||
extern cpumask_t cpu_callin_map;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user