From: Catalin Marinas <catalin.marinas@arm.com>
Date: Wed, 9 Aug 2017 14:37:49 +0000 (+0100)
Subject: Merge branch 'arm64/exception-stack' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0553896787353e2526078064ff1cf21ff7bc34ce;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'arm64/exception-stack' of git://git./linux/kernel/git/mark/linux into for-next/core

* 'arm64/exception-stack' of git://git.kernel.org/pub/scm/linux/kernel/git/mark/linux:
  arm64: unwind: remove sp from struct stackframe
  arm64: unwind: reference pt_regs via embedded stack frame
  arm64: unwind: disregard frame.sp when validating frame pointer
  arm64: unwind: avoid percpu indirection for irq stack
  arm64: move non-entry code out of .entry.text
  arm64: consistently use bl for C exception entry
  arm64: Add ASM_BUG()
---

0553896787353e2526078064ff1cf21ff7bc34ce
diff --cc arch/arm64/include/asm/ptrace.h
index 4f64373b84fd,ee72aa979078..6069d66e0bc2
--- a/arch/arm64/include/asm/ptrace.h
+++ b/arch/arm64/include/asm/ptrace.h
@@@ -127,28 -116,12 +127,29 @@@ struct pt_regs 
  		};
  	};
  	u64 orig_x0;
 -	u64 syscallno;
 +#ifdef __AARCH64EB__
 +	u32 unused2;
 +	s32 syscallno;
 +#else
 +	s32 syscallno;
 +	u32 unused2;
 +#endif
 +
  	u64 orig_addr_limit;
  	u64 unused;	// maintain 16 byte alignment
+ 	u64 stackframe[2];
  };
  
 +static inline bool in_syscall(struct pt_regs const *regs)
 +{
 +	return regs->syscallno != NO_SYSCALL;
 +}
 +
 +static inline void forget_syscall(struct pt_regs *regs)
 +{
 +	regs->syscallno = NO_SYSCALL;
 +}
 +
  #define MAX_REG_OFFSET offsetof(struct pt_regs, pstate)
  
  #define arch_has_single_step()	(1)