Skip to content

Commit 8f69cba

Browse files
xinli-intelIngo Molnar
authored andcommitted
x86: Rename __{start,end}_init_task to __{start,end}_init_stack
The stack of a task has been separated from the memory of a task_struct struture for a long time on x86, as a result __{start,end}_init_task no longer mark the start and end of the init_task structure, but its stack only. Rename __{start,end}_init_task to __{start,end}_init_stack. Note other architectures are not affected because __{start,end}_init_task are used on x86 only. Signed-off-by: Xin Li (Intel) <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Reviewed-by: Juergen Gross <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 2cb1618 commit 8f69cba

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

arch/x86/kernel/vmlinux.lds.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ SECTIONS
173173
INIT_TASK_DATA(THREAD_SIZE)
174174

175175
/* equivalent to task_pt_regs(&init_task) */
176-
__top_init_kernel_stack = __end_init_task - TOP_OF_KERNEL_STACK_PADDING - PTREGS_SIZE;
176+
__top_init_kernel_stack = __end_init_stack - TOP_OF_KERNEL_STACK_PADDING - PTREGS_SIZE;
177177

178178
#ifdef CONFIG_X86_32
179179
/* 32 bit has nosave before _edata */

include/asm-generic/vmlinux.lds.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -399,13 +399,13 @@
399399

400400
#define INIT_TASK_DATA(align) \
401401
. = ALIGN(align); \
402-
__start_init_task = .; \
402+
__start_init_stack = .; \
403403
init_thread_union = .; \
404404
init_stack = .; \
405405
KEEP(*(.data..init_task)) \
406406
KEEP(*(.data..init_thread_info)) \
407-
. = __start_init_task + THREAD_SIZE; \
408-
__end_init_task = .;
407+
. = __start_init_stack + THREAD_SIZE; \
408+
__end_init_stack = .;
409409

410410
#define JUMP_TABLE_DATA \
411411
. = ALIGN(8); \

0 commit comments

Comments
 (0)