[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH v3 1/1] 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.

Reviewed-by: Juergen Gross <jgross@xxxxxxxx>
Signed-off-by: Xin Li (Intel) <xin@xxxxxxxxx>
---

Change since v2:
* Rebase to the latest tip master branch.

Change since v1:
* Revert an accident insane change, init_task to init_stack (Jürgen Groß).
---
 arch/x86/kernel/vmlinux.lds.S     | 2 +-
 include/asm-generic/vmlinux.lds.h | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index d430880175f2..3509afc6a672 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -168,7 +168,7 @@ SECTIONS
                INIT_TASK_DATA(THREAD_SIZE)
 
                /* equivalent to task_pt_regs(&init_task) */
-               __top_init_kernel_stack = __end_init_task - 
TOP_OF_KERNEL_STACK_PADDING - PTREGS_SIZE;
+               __top_init_kernel_stack = __end_init_stack - 
TOP_OF_KERNEL_STACK_PADDING - PTREGS_SIZE;
 
 #ifdef CONFIG_X86_32
                /* 32 bit has nosave before _edata */
diff --git a/include/asm-generic/vmlinux.lds.h 
b/include/asm-generic/vmlinux.lds.h
index cb46306d8305..9752eb420ffa 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -399,13 +399,13 @@
 
 #define INIT_TASK_DATA(align)                                          \
        . = ALIGN(align);                                               \
-       __start_init_task = .;                                          \
+       __start_init_stack = .;                                         \
        init_thread_union = .;                                          \
        init_stack = .;                                                 \
        KEEP(*(.data..init_task))                                       \
        KEEP(*(.data..init_thread_info))                                \
-       . = __start_init_task + THREAD_SIZE;                            \
-       __end_init_task = .;
+       . = __start_init_stack + THREAD_SIZE;                           \
+       __end_init_stack = .;
 
 #define JUMP_TABLE_DATA                                                        
\
        . = ALIGN(8);                                                   \

base-commit: 93387dba36cc9033724d8b874a5cf6779ef084ab
-- 
2.44.0




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.