From: Mark Rutland <mark.rutland@arm.com>
To: linux-kernel@vger.kernel.org
Cc: linux-arch@vger.kernel.org, akpm@linux-foundation.org,
heiko.carstens@de.ibm.com, hpa@zytor.com, keescook@chromium.org,
luto@kernel.org, mark.rutland@arm.com, mingo@redhat.com,
tglx@linutronix.de
Subject: [PATCH 3/3] thread_info: include <current.h> for THREAD_INFO_IN_TASK
Date: Wed, 19 Oct 2016 19:28:13 +0100 [thread overview]
Message-ID: <1476901693-8492-4-git-send-email-mark.rutland@arm.com> (raw)
In-Reply-To: <1476901693-8492-1-git-send-email-mark.rutland@arm.com>
When CONFIG_THREAD_INFO_IN_TASK is selected, the current_thread_info()
macro relies on current having been defined prior to its use. However,
not all users of current_thread_info() include <asm/current.h>, and thus
current is not guaranteed to be defined.
When CONFIG_THREAD_INFO_IN_TASK is not selected, it's possible that
get_current() / current are based upon current_thread_info(), and
<asm/current.h> includes <asm/thread_info.h>. Thus always including
<asm/current.h> would result in circular dependences on some platforms.
To ensure both cases work, this patch includes <asm/current.h>, but only
when CONFIG_THREAD_INFO_IN_TASK is selected.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Kees Cook <keescook@chromium.org>
---
include/linux/thread_info.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
index c75c6ab..ef1f4b0 100644
--- a/include/linux/thread_info.h
+++ b/include/linux/thread_info.h
@@ -12,6 +12,7 @@
#include <linux/restart_block.h>
#ifdef CONFIG_THREAD_INFO_IN_TASK
+#include <asm/current.h>
#define current_thread_info() ((struct thread_info *)current)
#endif
--
1.9.1
next prev parent reply other threads:[~2016-10-19 18:28 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-19 18:28 [PATCH 0/3] THREAD_INFO_IN_TASK prep work for arm64+s390 Mark Rutland
2016-10-19 18:28 ` [PATCH 1/3] sched/core,x86: make struct thread_info arch specific again Mark Rutland
2016-10-19 18:28 ` Mark Rutland
2016-10-19 23:19 ` Andy Lutomirski
2016-10-20 6:40 ` Ingo Molnar
2016-10-20 9:33 ` Mark Rutland
2016-10-19 18:28 ` [PATCH 2/3] thread_info: factor out restart_block Mark Rutland
2016-10-19 18:28 ` Mark Rutland
2016-10-19 23:31 ` Andy Lutomirski
2016-10-24 9:45 ` Mark Rutland
2016-10-19 18:28 ` Mark Rutland [this message]
2016-10-19 18:28 ` [PATCH 3/3] thread_info: include <current.h> for THREAD_INFO_IN_TASK Mark Rutland
2016-10-20 10:29 ` Heiko Carstens
2016-10-24 9:49 ` Mark Rutland
2016-10-27 23:13 ` Andy Lutomirski
2016-10-27 23:13 ` Andy Lutomirski
2016-10-28 10:48 ` Mark Rutland
2016-10-24 10:12 ` [PATCH 0/3] THREAD_INFO_IN_TASK prep work for arm64+s390 Mark Rutland
2016-10-24 10:12 ` Mark Rutland
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=1476901693-8492-4-git-send-email-mark.rutland@arm.com \
--to=mark.rutland@arm.com \
--cc=akpm@linux-foundation.org \
--cc=heiko.carstens@de.ibm.com \
--cc=hpa@zytor.com \
--cc=keescook@chromium.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@redhat.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;
as well as URLs for NNTP newsgroup(s).