aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorGlauber Costa <gcosta@redhat.com>2008-03-27 13:06:00 -0400
committerIngo Molnar <mingo@elte.hu>2008-04-17 11:41:32 -0400
commitb23dab08fa37b302a8980e4cf925f2cb94288538 (patch)
tree1fed61f73d3d1be733e5e2de33acc9cbd8a21c8a /include
parentc1fa6c977eb978e1d09867475ec59c9a5799127f (diff)
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>
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86/smp.h13
-rw-r--r--include/asm-x86/smp_32.h13
-rw-r--r--include/asm-x86/smp_64.h16
3 files changed, 13 insertions, 29 deletions
diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h
index e5534f19c312..21472cea3d6c 100644
--- a/include/asm-x86/smp.h
+++ b/include/asm-x86/smp.h
@@ -5,6 +5,19 @@
5#include <linux/init.h> 5#include <linux/init.h>
6#include <asm/percpu.h> 6#include <asm/percpu.h>
7 7
8/*
9 * We need the APIC definitions automatically as part of 'smp.h'
10 */
11#ifdef CONFIG_X86_LOCAL_APIC
12# include <asm/mpspec.h>
13# include <asm/apic.h>
14# ifdef CONFIG_X86_IO_APIC
15# include <asm/io_apic.h>
16# endif
17#endif
18#include <asm/pda.h>
19#include <asm/thread_info.h>
20
8extern cpumask_t cpu_callout_map; 21extern cpumask_t cpu_callout_map;
9 22
10extern int smp_num_siblings; 23extern int smp_num_siblings;
diff --git a/include/asm-x86/smp_32.h b/include/asm-x86/smp_32.h
index 53432dbd5426..694d3245a88f 100644
--- a/include/asm-x86/smp_32.h
+++ b/include/asm-x86/smp_32.h
@@ -2,19 +2,6 @@
2#define __ASM_SMP_H 2#define __ASM_SMP_H
3 3
4#ifndef __ASSEMBLY__ 4#ifndef __ASSEMBLY__
5#include <linux/cpumask.h>
6#include <linux/init.h>
7
8/*
9 * We need the APIC definitions automatically as part of 'smp.h'
10 */
11#ifdef CONFIG_X86_LOCAL_APIC
12# include <asm/mpspec.h>
13# include <asm/apic.h>
14# ifdef CONFIG_X86_IO_APIC
15# include <asm/io_apic.h>
16# endif
17#endif
18 5
19extern cpumask_t cpu_callin_map; 6extern cpumask_t cpu_callin_map;
20 7
diff --git a/include/asm-x86/smp_64.h b/include/asm-x86/smp_64.h
index b83151d7388c..eead92e30b29 100644
--- a/include/asm-x86/smp_64.h
+++ b/include/asm-x86/smp_64.h
@@ -1,22 +1,6 @@
1#ifndef __ASM_SMP_H 1#ifndef __ASM_SMP_H
2#define __ASM_SMP_H 2#define __ASM_SMP_H
3 3
4#include <linux/cpumask.h>
5#include <linux/init.h>
6
7/*
8 * We need the APIC definitions automatically as part of 'smp.h'
9 */
10#ifdef CONFIG_X86_LOCAL_APIC
11# include <asm/mpspec.h>
12# include <asm/apic.h>
13# ifdef CONFIG_X86_IO_APIC
14# include <asm/io_apic.h>
15# endif
16#endif
17#include <asm/pda.h>
18#include <asm/thread_info.h>
19
20extern cpumask_t cpu_initialized; 4extern cpumask_t cpu_initialized;
21extern cpumask_t cpu_callin_map; 5extern cpumask_t cpu_callin_map;
22 6