]> git.baikalelectronics.ru Git - kernel.git/commit
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)
committerCatalin Marinas <catalin.marinas@arm.com>
Fri, 11 Nov 2016 18:25:08 +0000 (18:25 +0000)
commitbd606d6321f183f3434b4522df6e0cfd4dd2389b
tree206f033865e791ba50d3dd20407b5ebb9109caa9
parent6557c7cf3d26c1995acbd1931a14bbf6b42bb904
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>
include/linux/thread_info.h