aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorGlauber Costa <gcosta@redhat.com>2008-03-27 13:06:04 -0400
committerIngo Molnar <mingo@elte.hu>2008-04-17 11:41:33 -0400
commit8be9ac850564a409c1238cd5f53776c340aea4dc (patch)
tree1e72793c0909c3bc4c8df92be3bdd1808e0bec4c /include
parentecaa6c9de759259c5ba517e5442e26452d49107e (diff)
x86: merge smp_32.h and smp_64.h into smp.h
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>
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86/smp.h11
-rw-r--r--include/asm-x86/smp_32.h12
-rw-r--r--include/asm-x86/smp_64.h11
3 files changed, 5 insertions, 29 deletions
diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h
index 57b3d86dd9ed..bcbd25cbd863 100644
--- a/include/asm-x86/smp.h
+++ b/include/asm-x86/smp.h
@@ -19,6 +19,11 @@
19#include <asm/thread_info.h> 19#include <asm/thread_info.h>
20 20
21extern cpumask_t cpu_callout_map; 21extern cpumask_t cpu_callout_map;
22extern cpumask_t cpu_initialized;
23extern cpumask_t cpu_callin_map;
24
25extern void (*mtrr_hook)(void);
26extern void zap_low_mappings(void);
22 27
23extern int smp_num_siblings; 28extern int smp_num_siblings;
24extern unsigned int num_processors; 29extern unsigned int num_processors;
@@ -161,12 +166,6 @@ extern int safe_smp_processor_id(void);
161#define stack_smp_processor_id() 0 166#define stack_smp_processor_id() 0
162#endif 167#endif
163 168
164#ifdef CONFIG_X86_32
165# include "smp_32.h"
166#else
167# include "smp_64.h"
168#endif
169
170#ifdef CONFIG_X86_LOCAL_APIC 169#ifdef CONFIG_X86_LOCAL_APIC
171 170
172static inline int logical_smp_processor_id(void) 171static inline int logical_smp_processor_id(void)
diff --git a/include/asm-x86/smp_32.h b/include/asm-x86/smp_32.h
deleted file mode 100644
index d9ae5ac93dfc..000000000000
--- a/include/asm-x86/smp_32.h
+++ /dev/null
@@ -1,12 +0,0 @@
1#ifndef __ASM_SMP_H
2#define __ASM_SMP_H
3
4#ifndef __ASSEMBLY__
5
6extern cpumask_t cpu_callin_map;
7
8extern void (*mtrr_hook)(void);
9extern void zap_low_mappings(void);
10
11#endif /* !ASSEMBLY */
12#endif
diff --git a/include/asm-x86/smp_64.h b/include/asm-x86/smp_64.h
deleted file mode 100644
index 058f41399798..000000000000
--- a/include/asm-x86/smp_64.h
+++ /dev/null
@@ -1,11 +0,0 @@
1#ifndef __ASM_SMP_H
2#define __ASM_SMP_H
3
4extern cpumask_t cpu_initialized;
5extern cpumask_t cpu_callin_map;
6
7extern int smp_call_function_mask(cpumask_t mask, void (*func)(void *),
8 void *info, int wait);
9
10#endif
11