From a74a95e43d8411531b7bbdc906172e92591b164f Mon Sep 17 00:00:00 2001 From: Michael Ellerman Date: Wed, 30 Apr 2008 13:21:45 +1000 Subject: [PATCH] --- yaml --- r: 95322 b: refs/heads/master c: 3243d87441bf7f97c5c9f7dd46b35f5783ec6740 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/setup_64.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index fa31f9043b03..aba6083c940f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 595f403c1af37b1339e64b89040528b8cd48c5a3 +refs/heads/master: 3243d87441bf7f97c5c9f7dd46b35f5783ec6740 diff --git a/trunk/arch/powerpc/kernel/setup_64.c b/trunk/arch/powerpc/kernel/setup_64.c index dff6308d1b5e..25e3fd8606ab 100644 --- a/trunk/arch/powerpc/kernel/setup_64.c +++ b/trunk/arch/powerpc/kernel/setup_64.c @@ -487,9 +487,12 @@ static void __init emergency_stack_init(void) */ limit = min(0x10000000UL, lmb.rmo_size); - for_each_possible_cpu(i) - paca[i].emergency_sp = - __va(lmb_alloc_base(HW_PAGE_SIZE, 128, limit)) + HW_PAGE_SIZE; + for_each_possible_cpu(i) { + unsigned long sp; + sp = lmb_alloc_base(THREAD_SIZE, THREAD_SIZE, limit); + sp += THREAD_SIZE; + paca[i].emergency_sp = __va(sp); + } } /*