tree e1157d3b437e355168455a00ca96797c6da30a43
parent 7d1ab81f7a17ca319427e879592e0b9a231067a8
author Mark Rutland <mark.rutland@arm.com> 1476901693 +0100
committer Greg Hackmann <ghackmann@google.com> 1524601692 -0700

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>
(cherry picked from commit dc3d2a679cd8631b8a570fc8ca5f4712d7d25698)

Change-Id: If6e47e03c9bef27ff7f4429ed15367e8ff185bed
Signed-off-by: Greg Hackmann <ghackmann@google.com>