diff options
author | Andi Kleen <ak@suse.de> | 2006-09-26 04:52:28 -0400 |
---|---|---|
committer | Andi Kleen <andi@basil.nowhere.org> | 2006-09-26 04:52:28 -0400 |
commit | 2f766d16062d0147edff91be15de4a950667ca42 (patch) | |
tree | 20c7f80312aedabf8659483b53f67afa8ccc51db /include/asm-x86_64/smp.h | |
parent | 3cfc348bf90ffaa777c188652aa297f04eb94de8 (diff) |
[PATCH] Clean up asm/smp.h includes
No need to include it from entry.S
Drop all the #ifdef __ASSEMBLY__
Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'include/asm-x86_64/smp.h')
-rw-r--r-- | include/asm-x86_64/smp.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/include/asm-x86_64/smp.h b/include/asm-x86_64/smp.h index d61547fd833..612d208961a 100644 --- a/include/asm-x86_64/smp.h +++ b/include/asm-x86_64/smp.h | |||
@@ -4,15 +4,12 @@ | |||
4 | /* | 4 | /* |
5 | * We need the APIC definitions automatically as part of 'smp.h' | 5 | * We need the APIC definitions automatically as part of 'smp.h' |
6 | */ | 6 | */ |
7 | #ifndef __ASSEMBLY__ | ||
8 | #include <linux/threads.h> | 7 | #include <linux/threads.h> |
9 | #include <linux/cpumask.h> | 8 | #include <linux/cpumask.h> |
10 | #include <linux/bitops.h> | 9 | #include <linux/bitops.h> |
11 | extern int disable_apic; | 10 | extern int disable_apic; |
12 | #endif | ||
13 | 11 | ||
14 | #ifdef CONFIG_X86_LOCAL_APIC | 12 | #ifdef CONFIG_X86_LOCAL_APIC |
15 | #ifndef __ASSEMBLY__ | ||
16 | #include <asm/fixmap.h> | 13 | #include <asm/fixmap.h> |
17 | #include <asm/mpspec.h> | 14 | #include <asm/mpspec.h> |
18 | #ifdef CONFIG_X86_IO_APIC | 15 | #ifdef CONFIG_X86_IO_APIC |
@@ -21,10 +18,8 @@ extern int disable_apic; | |||
21 | #include <asm/apic.h> | 18 | #include <asm/apic.h> |
22 | #include <asm/thread_info.h> | 19 | #include <asm/thread_info.h> |
23 | #endif | 20 | #endif |
24 | #endif | ||
25 | 21 | ||
26 | #ifdef CONFIG_SMP | 22 | #ifdef CONFIG_SMP |
27 | #ifndef ASSEMBLY | ||
28 | 23 | ||
29 | #include <asm/pda.h> | 24 | #include <asm/pda.h> |
30 | 25 | ||
@@ -83,13 +78,10 @@ extern void prefill_possible_map(void); | |||
83 | extern unsigned num_processors; | 78 | extern unsigned num_processors; |
84 | extern unsigned disabled_cpus; | 79 | extern unsigned disabled_cpus; |
85 | 80 | ||
86 | #endif /* !ASSEMBLY */ | ||
87 | |||
88 | #define NO_PROC_ID 0xFF /* No processor magic marker */ | 81 | #define NO_PROC_ID 0xFF /* No processor magic marker */ |
89 | 82 | ||
90 | #endif | 83 | #endif |
91 | 84 | ||
92 | #ifndef ASSEMBLY | ||
93 | /* | 85 | /* |
94 | * Some lowlevel functions might want to know about | 86 | * Some lowlevel functions might want to know about |
95 | * the real APIC ID <-> CPU # mapping. | 87 | * the real APIC ID <-> CPU # mapping. |
@@ -111,8 +103,6 @@ static inline int cpu_present_to_apicid(int mps_cpu) | |||
111 | return BAD_APICID; | 103 | return BAD_APICID; |
112 | } | 104 | } |
113 | 105 | ||
114 | #endif /* !ASSEMBLY */ | ||
115 | |||
116 | #ifndef CONFIG_SMP | 106 | #ifndef CONFIG_SMP |
117 | #define stack_smp_processor_id() 0 | 107 | #define stack_smp_processor_id() 0 |
118 | #define safe_smp_processor_id() 0 | 108 | #define safe_smp_processor_id() 0 |
@@ -127,7 +117,6 @@ static inline int cpu_present_to_apicid(int mps_cpu) | |||
127 | }) | 117 | }) |
128 | #endif | 118 | #endif |
129 | 119 | ||
130 | #ifndef __ASSEMBLY__ | ||
131 | static __inline int logical_smp_processor_id(void) | 120 | static __inline int logical_smp_processor_id(void) |
132 | { | 121 | { |
133 | /* we don't want to mark this access volatile - bad code generation */ | 122 | /* we don't want to mark this access volatile - bad code generation */ |
@@ -146,6 +135,5 @@ static inline int smp_call_function_single(int cpuid, void (*func) (void *info), | |||
146 | return 0; | 135 | return 0; |
147 | } | 136 | } |
148 | #endif /* !CONFIG_SMP */ | 137 | #endif /* !CONFIG_SMP */ |
149 | #endif /* !__ASSEMBLY */ | ||
150 | #endif | 138 | #endif |
151 | 139 | ||