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

Commit d2d9cb96 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM64: fix KSTK_ESP"

parents 66055e45 c2484772

arch/arm64/include/asm/processor.h

+12 −0
Original line number Diff line number Diff line
@@ -140,7 +140,19 @@ extern struct task_struct *cpu_switch_to(struct task_struct *prev, 
	((struct pt_regs *)(THREAD_START_SP + task_stack_page(p)) - 1)



#define KSTK_EIP(tsk)	task_pt_regs(tsk)->pc

#ifndef CONFIG_COMPAT

#define KSTK_ESP(tsk)	task_pt_regs(tsk)->sp

#else

#define KSTK_ESP(tsk)					\

({							\

	u64 ptr;					\

	if (is_compat_thread(task_thread_info(tsk)))	\

		ptr = task_pt_regs(tsk)->compat_sp;	\

	else						\

		ptr = task_pt_regs(tsk)->sp;		\

	ptr;						\

})

#endif



/*

 * Prefetching support