diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2019-06-18 14:29:35 +0200 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2019-06-18 14:29:35 +0200 |
| commit | d15d0b7a9f89cf5a905ad6802eb23100c8063939 (patch) | |
| tree | 84caa660dc73842efa29e116dcb3e32aa81a5cf0 /arch/arm64/kernel/sys.c | |
| parent | e9dcc568b2e968af848bbdb4267ba6cde5457b9e (diff) | |
| parent | 858848641fbecd42437e36adc9291b0ce5db379e (diff) | |
Merge tag 'v4.19.50-rt22' into toradex_4.19.y-rt
Linux 4.19.50-rt22
Diffstat (limited to 'arch/arm64/kernel/sys.c')
| -rw-r--r-- | arch/arm64/kernel/sys.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/kernel/sys.c b/arch/arm64/kernel/sys.c index b44065fb1616..162a95ed0881 100644 --- a/arch/arm64/kernel/sys.c +++ b/arch/arm64/kernel/sys.c @@ -31,7 +31,7 @@ SYSCALL_DEFINE6(mmap, unsigned long, addr, unsigned long, len, unsigned long, prot, unsigned long, flags, - unsigned long, fd, off_t, off) + unsigned long, fd, unsigned long, off) { if (offset_in_page(off) != 0) return -EINVAL; @@ -50,7 +50,7 @@ SYSCALL_DEFINE1(arm64_personality, unsigned int, personality) /* * Wrappers to pass the pt_regs argument. */ -#define sys_personality sys_arm64_personality +#define __arm64_sys_personality __arm64_sys_arm64_personality asmlinkage long sys_ni_syscall(const struct pt_regs *); #define __arm64_sys_ni_syscall sys_ni_syscall |