From 70b330caef3ca7cb6b009a299e49b5be3a330308 Mon Sep 17 00:00:00 2001 From: Greg Hackmann Date: Wed, 18 Apr 2018 15:33:53 -0700 Subject: [PATCH] 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 --- arch/arm64/kernel/asm-offsets.c | 2 +- arch/arm64/kernel/setup.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c index 46b4e1b3caef..5d2d3560f186 100644 --- a/arch/arm64/kernel/asm-offsets.c +++ b/arch/arm64/kernel/asm-offsets.c @@ -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(); diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 6a9dc51da64c..b5222094ab52 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -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