OSDN Git Service

UPSTREAM: thread_info: include <current.h> for THREAD_INFO_IN_TASK
authorMark Rutland <mark.rutland@arm.com>
Wed, 19 Oct 2016 18:28:13 +0000 (19:28 +0100)
committerZubin Mithra <zsm@google.com>
Wed, 9 Aug 2017 14:23:22 +0000 (15:23 +0100)
commitf2b8210f0a7c3f717b82880a1160aaa9255ceecf
tree1a915fffaa7ef528cb1dfb4e8f8b95724a70c7bf
parent264c551c4c77c9645a1c5a03735a71ed37348bc4
UPSTREAM: thread_info: include <current.h> for THREAD_INFO_IN_TASK

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>
Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Reviewed-by: Andy Lutomirski <luto@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Kees Cook <keescook@chromium.org>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Bug: 38331309
Change-Id: Ia981a829798d60a54d4e3eb679d8e24b01228357
(cherry picked from commit dc3d2a679cd8631b8a570fc8ca5f4712d7d25698)
Signed-off-by: Zubin Mithra <zsm@google.com>
include/linux/thread_info.h