diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-07-05 14:22:14 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-07-05 14:22:14 +1000 |
| commit | 76d32a87adac2aaaaf5a4134f225ede4f37f7678 (patch) | |
| tree | 15d743f8da99c38f52190e11e1788c90f49385ae /arch/x86/kernel/cpu/topology.c | |
| parent | 92221d1fc707b50772262839aef545c1f5fbc94e (diff) | |
| parent | 1247de2692e051a667238787385a65e8ea9bbaee (diff) | |
Merge branch 'cpuinit/master'
Diffstat (limited to 'arch/x86/kernel/cpu/topology.c')
| -rw-r--r-- | arch/x86/kernel/cpu/topology.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/topology.c b/arch/x86/kernel/cpu/topology.c index 4397e987a1cf..4c60eaf0571c 100644 --- a/arch/x86/kernel/cpu/topology.c +++ b/arch/x86/kernel/cpu/topology.c @@ -26,7 +26,7 @@ * exists, use it for populating initial_apicid and cpu topology * detection. */ -void __cpuinit detect_extended_topology(struct cpuinfo_x86 *c) +void detect_extended_topology(struct cpuinfo_x86 *c) { #ifdef CONFIG_SMP unsigned int eax, ebx, ecx, edx, sub_index; |