ANDROID: arm64: fix ARM64_SW_TTBR0_PAN backport

Point setup.c and asm-offsets.c at ttbr0's new home inside task_struct.

Change-Id: I25b7913ed01b8eb15ab1200910dca769ed1d6995
Signed-off-by: Greg Hackmann <ghackmann@google.com>
This commit is contained in:
Greg Hackmann
2018-04-18 15:33:53 -07:00
parent 5b7e8f735c
commit 70b330caef
2 changed files with 2 additions and 2 deletions

View File

@@ -41,7 +41,7 @@ int main(void)
DEFINE(TSK_TI_PREEMPT, offsetof(struct task_struct, thread_info.preempt_count));
DEFINE(TSK_TI_ADDR_LIMIT, offsetof(struct task_struct, thread_info.addr_limit));
#ifdef CONFIG_ARM64_SW_TTBR0_PAN
DEFINE(TSK_TI_TTBR0, offsetof(struct thread_info, ttbr0));
DEFINE(TSK_TI_TTBR0, offsetof(struct task_struct, thread_info.ttbr0));
#endif
DEFINE(TSK_STACK, offsetof(struct task_struct, stack));
BLANK();

View File

@@ -298,7 +298,7 @@ void __init setup_arch(char **cmdline_p)
* faults in case uaccess_enable() is inadvertently called by the init
* thread.
*/
init_thread_info.ttbr0 = __pa_symbol(empty_zero_page);
init_task.thread_info.ttbr0 = __pa_symbol(empty_zero_page);
#endif
#ifdef CONFIG_VT