projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm64
/
include
/
asm
/
compat.h
diff --git
a/arch/arm64/include/asm/compat.h
b/arch/arm64/include/asm/compat.h
index 37e610dc084ed76b532f0647f07d6c2085b69798..618b450e5a1d5e009f30784b11e66a3fbc6468c5 100644
(file)
--- a/
arch/arm64/include/asm/compat.h
+++ b/
arch/arm64/include/asm/compat.h
@@
-23,6
+23,7
@@
*/
#include <linux/types.h>
#include <linux/sched.h>
*/
#include <linux/types.h>
#include <linux/sched.h>
+#include <linux/ptrace.h>
#define COMPAT_USER_HZ 100
#define COMPAT_UTS_MACHINE "armv8l\0\0"
#define COMPAT_USER_HZ 100
#define COMPAT_UTS_MACHINE "armv8l\0\0"
@@
-209,10
+210,11
@@
static inline compat_uptr_t ptr_to_compat(void __user *uptr)
return (u32)(unsigned long)uptr;
}
return (u32)(unsigned long)uptr;
}
+#define compat_user_stack_pointer() (current_pt_regs()->compat_sp)
+
static inline void __user *arch_compat_alloc_user_space(long len)
{
static inline void __user *arch_compat_alloc_user_space(long len)
{
- struct pt_regs *regs = task_pt_regs(current);
- return (void __user *)regs->compat_sp - len;
+ return (void __user *)compat_user_stack_pointer() - len;
}
struct compat_ipc64_perm {
}
struct compat_ipc64_perm {