summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilton Miller <miltonm@bga.com>2011-05-10 21:28:41 +0200
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-05-19 06:30:44 +0200
commitbd9e5eefecb3d69018bb95796298019d309cbec8 (patch)
tree77bb886d4c3db1a561f629bf73e43dfaf1d379e3
parentpowerpc: Don't search for paca in freed memory (diff)
downloadlinux-bd9e5eefecb3d69018bb95796298019d309cbec8.tar.xz
linux-bd9e5eefecb3d69018bb95796298019d309cbec8.zip
powerpc/kdump64: Don't reference freed memory as pacas
Starting with 1426d5a3bd07589534286375998c0c8c6fdc5260 (powerpc: Dynamically allocate pacas) the space for pacas beyond cpu_possible is freed, but we failed to update the loop in crash.c. Since c1854e00727f50f7ac99e98d26ece04c087ef785 (powerpc: Set nr_cpu_ids early and use it to free PACAs) the number of pacas allocated is always nr_cpu_ids. Signed-off-by: Milton Miller <miltonm@bga.com> Cc: <stable@kernel.org> # .34.x Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-rw-r--r--arch/powerpc/kernel/crash.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c
index 21f2c781ded1..4e6ee944495a 100644
--- a/arch/powerpc/kernel/crash.c
+++ b/arch/powerpc/kernel/crash.c
@@ -236,7 +236,7 @@ static void crash_kexec_wait_realmode(int cpu)
int i;
msecs = 10000;
- for (i=0; i < NR_CPUS && msecs > 0; i++) {
+ for (i=0; i < nr_cpu_ids && msecs > 0; i++) {
if (i == cpu)
continue;