aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel/smpboot.c
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy@goop.org>2007-05-02 13:27:12 -0400
committerAndi Kleen <andi@basil.nowhere.org>2007-05-02 13:27:12 -0400
commita6c4e076ee4c1ea670e4faa55814e63dd08e3f29 (patch)
tree42ae132ca8ad99b05904af07ed8abc6aeef33aa8 /arch/i386/kernel/smpboot.c
parent1353ebb4b48151e3810d9a60449edd43a90ea3c3 (diff)
[PATCH] i386: clean up identify_cpu
identify_cpu() is used to identify both the boot CPU and secondary CPUs, but it performs some actions which only apply to the boot CPU. Those functions are therefore really __init functions, but because they're called by identify_cpu(), they must be marked __cpuinit. This patch splits identify_cpu() into identify_boot_cpu() and identify_secondary_cpu(), and calls the appropriate init functions from each. Also, identify_boot_cpu() and all the functions it dominates are marked __init. Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com> Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/i386/kernel/smpboot.c')
-rw-r--r--arch/i386/kernel/smpboot.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c
index 1c3ad9b406ca..61e2842add36 100644
--- a/arch/i386/kernel/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
@@ -155,7 +155,7 @@ static void __cpuinit smp_store_cpu_info(int id)
155 155
156 *c = boot_cpu_data; 156 *c = boot_cpu_data;
157 if (id!=0) 157 if (id!=0)
158 identify_cpu(c); 158 identify_secondary_cpu(c);
159 /* 159 /*
160 * Mask B, Pentium, but not Pentium MMX 160 * Mask B, Pentium, but not Pentium MMX
161 */ 161 */