Commit 13c01139 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86/headers: Remove APIC headers from <asm/smp.h> 



The APIC headers are relatively complex and bring in additional
header dependencies - while smp.h is a relatively simple header
included from high level headers.

Remove the dependency and add in the missing #include's in .c
files where they gained it indirectly before.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent a703f363

arch/x86/include/asm/smp.h

+0 −10
Original line number Diff line number Diff line
@@ -5,16 +5,6 @@ 
#include <linux/cpumask.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/thread_info.h>

#include <asm/cpumask.h>

arch/x86/include/asm/tsc.h

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#define _ASM_X86_TSC_H



#include <asm/processor.h>

#include <asm/cpufeature.h>



#define NS_SCALE	10 /* 2^10, carefully chosen */

#define US_SCALE	32 /* 2^32, arbitralrily chosen */

arch/x86/kernel/apic/apic.c

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
#include <asm/proto.h>

#include <asm/traps.h>

#include <asm/apic.h>

#include <asm/acpi.h>

#include <asm/io_apic.h>

#include <asm/desc.h>

#include <asm/hpet.h>

arch/x86/kernel/apic/bigsmp_32.c

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/smp.h>



#include <asm/apic.h>

#include <asm/io_apic.h>



#include "local.h"

arch/x86/kernel/apic/ipi.c

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


#include <linux/cpumask.h>

#include <linux/smp.h>

#include <asm/io_apic.h>



#include "local.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE