diff options
author | Suresh Siddha <suresh.b.siddha@intel.com> | 2011-05-20 20:51:20 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-05-22 05:48:04 -0400 |
commit | 1a8880a14270814dae0d226a2ad065d30587e60a (patch) | |
tree | db42759ef2828202fd6933541d937885c2b6169e /arch/x86/kernel/apic/probe_32.c | |
parent | 69c252ffce77f4e38347d536ee4eab4aa162dc67 (diff) |
x86, apic: Make apic drivers static
Apic probe now looks at the apic drivers listed in the
.apicdrivers section. Remove apic_probe[] and make each apic
driver static.
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Tested-by: Cyrill Gorcunov <gorcunov@openvz.org>
Cc: steiner@sgi.com
Cc: gorcunov@openvz.org
Cc: yinghai@kernel.org
Link: http://lkml.kernel.org/r/20110521005526.341718626@sbsiddha-MOBL3.sc.intel.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/apic/probe_32.c')
-rw-r--r-- | arch/x86/kernel/apic/probe_32.c | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c index c81756d8d4ec..b5254ad044ab 100644 --- a/arch/x86/kernel/apic/probe_32.c +++ b/arch/x86/kernel/apic/probe_32.c | |||
@@ -87,7 +87,7 @@ static int probe_default(void) | |||
87 | return 1; | 87 | return 1; |
88 | } | 88 | } |
89 | 89 | ||
90 | struct apic apic_default = { | 90 | static struct apic apic_default = { |
91 | 91 | ||
92 | .name = "default", | 92 | .name = "default", |
93 | .probe = probe_default, | 93 | .probe = probe_default, |
@@ -151,33 +151,9 @@ struct apic apic_default = { | |||
151 | 151 | ||
152 | apic_driver(apic_default); | 152 | apic_driver(apic_default); |
153 | 153 | ||
154 | extern struct apic apic_numaq; | ||
155 | extern struct apic apic_summit; | ||
156 | extern struct apic apic_bigsmp; | ||
157 | extern struct apic apic_es7000; | ||
158 | extern struct apic apic_es7000_cluster; | ||
159 | |||
160 | struct apic *apic = &apic_default; | 154 | struct apic *apic = &apic_default; |
161 | EXPORT_SYMBOL_GPL(apic); | 155 | EXPORT_SYMBOL_GPL(apic); |
162 | 156 | ||
163 | static struct apic *apic_probe[] __initdata = { | ||
164 | #ifdef CONFIG_X86_NUMAQ | ||
165 | &apic_numaq, | ||
166 | #endif | ||
167 | #ifdef CONFIG_X86_SUMMIT | ||
168 | &apic_summit, | ||
169 | #endif | ||
170 | #ifdef CONFIG_X86_BIGSMP | ||
171 | &apic_bigsmp, | ||
172 | #endif | ||
173 | #ifdef CONFIG_X86_ES7000 | ||
174 | &apic_es7000, | ||
175 | &apic_es7000_cluster, | ||
176 | #endif | ||
177 | &apic_default, /* must be last */ | ||
178 | NULL, | ||
179 | }; | ||
180 | |||
181 | static int cmdline_apic __initdata; | 157 | static int cmdline_apic __initdata; |
182 | static int __init parse_apic(char *arg) | 158 | static int __init parse_apic(char *arg) |
183 | { | 159 | { |