[PATCH 2/2] init: annotate init_task as __init_task_data for all arches

From: Masahiro Yamada
Date: Thu Jun 18 2020 - 12:19:39 EST


__init_task_data is no-op when CONFIG_ARCH_TASK_STRUCT_ON_STACK=n,
so you can always annotate init_task as __init_task_data.

Signed-off-by: Masahiro Yamada <masahiroy@xxxxxxxxxx>
---

init/init_task.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/init/init_task.c b/init/init_task.c
index 15089d15010a..0110b2941c4d 100644
--- a/init/init_task.c
+++ b/init/init_task.c
@@ -61,11 +61,7 @@ unsigned long init_shadow_call_stack[SCS_SIZE / sizeof(long)]
* Set up the first task table, touch at your own risk!. Base=0,
* limit=0x1fffff (=2MB)
*/
-struct task_struct init_task
-#ifdef CONFIG_ARCH_TASK_STRUCT_ON_STACK
- __init_task_data
-#endif
-= {
+struct task_struct init_task __init_task_data = {
#ifdef CONFIG_THREAD_INFO_IN_TASK
.thread_info = INIT_THREAD_INFO(init_task),
.stack_refcount = REFCOUNT_INIT(1),
--
2.25.1