Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0d58c97 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

[PATCH] x86-64: Set the stack pointer correctly in init_thread and init_tss 



Signed-off-by: default avatarJan Beulich <jbeulich@novell.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1209140c

arch/x86_64/kernel/init_task.c

+1 −1
Original line number Diff line number Diff line
@@ -44,6 +44,6 @@ EXPORT_SYMBOL(init_task); 
 * section. Since TSS's are completely CPU-local, we want them

 * on exact cacheline boundaries, to eliminate cacheline ping-pong.

 */ 

DEFINE_PER_CPU(struct tss_struct, init_tss) ____cacheline_maxaligned_in_smp;

DEFINE_PER_CPU(struct tss_struct, init_tss) ____cacheline_maxaligned_in_smp = INIT_TSS;



#define ALIGN_TO_4K __attribute__((section(".data.init_task")))

include/asm-x86_64/processor.h

+7 −1
Original line number Diff line number Diff line
@@ -254,7 +254,13 @@ struct thread_struct { 
	u64 tls_array[GDT_ENTRY_TLS_ENTRIES];

} __attribute__((aligned(16)));



#define INIT_THREAD  {}

#define INIT_THREAD  { \

	.rsp0 = (unsigned long)&init_stack + sizeof(init_stack) \

}



#define INIT_TSS  { \

	.rsp0 = (unsigned long)&init_stack + sizeof(init_stack) \

}



#define INIT_MMAP \

{ &init_mm, 0, 0, NULL, PAGE_SHARED, VM_READ | VM_WRITE | VM_EXEC, 1, NULL, NULL }