Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70b330ca authored by Greg Hackmann's avatar Greg Hackmann
Browse files

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: default avatarGreg Hackmann <ghackmann@google.com>
parent 5b7e8f73

arch/arm64/kernel/asm-offsets.c

+1 −1
Original line number Diff line number Diff line
@@ -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();

arch/arm64/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -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