aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/smpboot_32.c
diff options
context:
space:
mode:
authorMike Travis <travis@sgi.com>2008-01-30 07:30:55 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:30:55 -0500
commit7bf0c23ed24b0d95a2a717f86dce1f210e16f8a5 (patch)
tree64f1d21cfcc7746d430c4ad70c864e176536ac8d /arch/x86/kernel/smpboot_32.c
parent0fa376e027f0bd71368e1485f863f0dff8f7c897 (diff)
x86: prevent dereferencing non-allocated per_cpu variables
'for_each_possible_cpu(i)' when there's a _remote possibility_ of dereferencing a non-allocated per_cpu variable involved. All files except mm/vmstat.c are x86 arch. Thanks to pageexec@freemail.hu for pointing this out. Signed-off-by: Mike Travis <travis@sgi.com> Cc: Christoph Lameter <clameter@sgi.com> Cc: <pageexec@freemail.hu> Cc: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/smpboot_32.c')
-rw-r--r--arch/x86/kernel/smpboot_32.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/smpboot_32.c b/arch/x86/kernel/smpboot_32.c
index 239ada1c499c..0bf7f20baba0 100644
--- a/arch/x86/kernel/smpboot_32.c
+++ b/arch/x86/kernel/smpboot_32.c
@@ -1090,7 +1090,7 @@ static void __init smp_boot_cpus(unsigned int max_cpus)
1090 * Allow the user to impress friends. 1090 * Allow the user to impress friends.
1091 */ 1091 */
1092 Dprintk("Before bogomips.\n"); 1092 Dprintk("Before bogomips.\n");
1093 for (cpu = 0; cpu < NR_CPUS; cpu++) 1093 for_each_possible_cpu(cpu)
1094 if (cpu_isset(cpu, cpu_callout_map)) 1094 if (cpu_isset(cpu, cpu_callout_map))
1095 bogosum += cpu_data(cpu).loops_per_jiffy; 1095 bogosum += cpu_data(cpu).loops_per_jiffy;
1096 printk(KERN_INFO 1096 printk(KERN_INFO
@@ -1121,7 +1121,7 @@ static void __init smp_boot_cpus(unsigned int max_cpus)
1121 * construct cpu_sibling_map, so that we can tell sibling CPUs 1121 * construct cpu_sibling_map, so that we can tell sibling CPUs
1122 * efficiently. 1122 * efficiently.
1123 */ 1123 */
1124 for (cpu = 0; cpu < NR_CPUS; cpu++) { 1124 for_each_possible_cpu(cpu) {
1125 cpus_clear(per_cpu(cpu_sibling_map, cpu)); 1125 cpus_clear(per_cpu(cpu_sibling_map, cpu));
1126 cpus_clear(per_cpu(cpu_core_map, cpu)); 1126 cpus_clear(per_cpu(cpu_core_map, cpu));
1127 } 1127 }