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

x86: merge includes in smp.h 



move all include directives from smp_{32,64}.h to smp.h.

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

include/asm-x86/smp.h

+13 −0
Original line number Diff line number Diff line
@@ -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;

include/asm-x86/smp_32.h

+0 −13
Original line number Diff line number Diff line
@@ -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;

include/asm-x86/smp_64.h

+0 −16
Original line number Diff line number Diff line 
#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;