From: Masahiro Yamada <masahiroy@kernel.org>
To: David Howells <dhowells@redhat.com>
Cc: Masahiro Yamada <masahiroy@kernel.org>,
"Eric W. Biederman" <ebiederm@xmission.com>,
Ingo Molnar <mingo@kernel.org>, Marco Elver <elver@google.com>,
Mike Rapoport <rppt@linux.ibm.com>,
"Paul E. McKenney" <paulmck@kernel.org>,
Sami Tolvanen <samitolvanen@google.com>,
Thomas Gleixner <tglx@linutronix.de>,
linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] init: annotate init_task as __init_task_data for all arches
Date: Fri, 19 Jun 2020 01:17:50 +0900 [thread overview]
Message-ID: <20200618161750.178659-2-masahiroy@kernel.org> (raw)
In-Reply-To: <20200618161750.178659-1-masahiroy@kernel.org>
__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@kernel.org>
---
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
prev parent reply other threads:[~2020-06-18 16:19 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-18 16:17 [PATCH 1/2] sched: fix thread_union::task visibility Masahiro Yamada
2020-06-18 16:17 ` Masahiro Yamada [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200618161750.178659-2-masahiroy@kernel.org \
--to=masahiroy@kernel.org \
--cc=dhowells@redhat.com \
--cc=ebiederm@xmission.com \
--cc=elver@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=paulmck@kernel.org \
--cc=rppt@linux.ibm.com \
--cc=samitolvanen@google.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®