diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2017-08-14 23:12:52 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-14 23:12:52 +0000 |
| commit | 162f0b5d62fd824fb6b9f56dd1f34ceb6ed25aba (patch) | |
| tree | 25964d826f42332c50a869f3f93883b38ebaaa7f | |
| parent | 6d41d00029e4688244b606623677a48a749059c2 (diff) | |
| parent | 9e4822b9922a7b653ed909fa9277d0dd64249de7 (diff) | |
| download | v4.4-162f0b5d62fd824fb6b9f56dd1f34ceb6ed25aba.tar.gz | |
ANDROID: arm64: fix undeclared 'init_thread_info' error am: e991aa38ea
am: 9e4822b992
Change-Id: I51aa123da9b2370478e0972fb11fbd8fdcc8a8f9
| -rw-r--r-- | arch/arm64/include/asm/thread_info.h | 2 | ||||
| -rw-r--r-- | arch/arm64/kernel/setup.c | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm64/include/asm/thread_info.h b/arch/arm64/include/asm/thread_info.h index ec4f8c04aeda..67dd228c3f17 100644 --- a/arch/arm64/include/asm/thread_info.h +++ b/arch/arm64/include/asm/thread_info.h @@ -90,6 +90,8 @@ static inline struct thread_info *current_thread_info(void) return (struct thread_info *)sp_el0; } + +#define init_thread_info (init_thread_union.thread_info) #endif #define init_stack (init_thread_union.stack) diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 6591bf23422b..ede6cc373f43 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -349,11 +349,15 @@ void __init setup_arch(char **cmdline_p) #ifdef CONFIG_ARM64_SW_TTBR0_PAN /* - * Make sure init_thread_info.ttbr0 always generates translation + * Make sure thread_info.ttbr0 always generates translation * faults in case uaccess_enable() is inadvertently called by the init * thread. */ - init_thread_info.ttbr0 = virt_to_phys(empty_zero_page); +#ifdef CONFIG_THREAD_INFO_IN_TASK + init_task.thread_info.ttbr0 = virt_to_phys(empty_zero_page); +#else + init_thread_info.ttbr0 = (init_thread_union.thread_info); +#endif #endif #ifdef CONFIG_VT |