[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-b9b1a9c363ff7b17b2a35e20e28e86a449cfde1f@git.kernel.org>
Date: Thu, 20 Oct 2016 04:10:39 -0700
From: tip-bot for Josh Poimboeuf <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: hpa@...or.com, mingo@...nel.org, peterz@...radead.org,
tglx@...utronix.de, luto@...nel.org, dvlasenk@...hat.com,
nilayvaish@...il.com, linux-kernel@...r.kernel.org, bp@...en8.de,
jpoimboe@...hat.com, torvalds@...ux-foundation.org,
brgerst@...il.com
Subject: [tip:x86/asm] x86/boot/smp/32: Fix initial idle stack location on
32-bit kernels
Commit-ID: b9b1a9c363ff7b17b2a35e20e28e86a449cfde1f
Gitweb: http://git.kernel.org/tip/b9b1a9c363ff7b17b2a35e20e28e86a449cfde1f
Author: Josh Poimboeuf <jpoimboe@...hat.com>
AuthorDate: Wed, 21 Sep 2016 16:04:03 -0500
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Thu, 20 Oct 2016 09:15:23 +0200
x86/boot/smp/32: Fix initial idle stack location on 32-bit kernels
On 32-bit kernels, the initial idle stack calculation doesn't take into
account the TOP_OF_KERNEL_STACK_PADDING, making the stack end address
inconsistent with other tasks on 32-bit.
Signed-off-by: Josh Poimboeuf <jpoimboe@...hat.com>
Reviewed-by: Andy Lutomirski <luto@...nel.org>
Cc: Borislav Petkov <bp@...en8.de>
Cc: Brian Gerst <brgerst@...il.com>
Cc: Denys Vlasenko <dvlasenk@...hat.com>
Cc: H. Peter Anvin <hpa@...or.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Nilay Vaish <nilayvaish@...il.com>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Link: http://lkml.kernel.org/r/6cf569410bfa84cf923902fc4d628444cace94be.1474480779.git.jpoimboe@redhat.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
arch/x86/kernel/smpboot.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index 951f093..dcbd45a 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -964,9 +964,7 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
int cpu0_nmi_registered = 0;
unsigned long timeout;
- idle->thread.sp = (unsigned long) (((struct pt_regs *)
- (THREAD_SIZE + task_stack_page(idle))) - 1);
-
+ idle->thread.sp = (unsigned long)task_pt_regs(idle);
early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
initial_code = (unsigned long)start_secondary;
initial_stack = idle->thread.sp;
Powered by blists - more mailing lists