| Message ID | 20190528113934.55295-1-catalin.marinas@arm.com |
|---|---|
| State | Accepted |
| Commit | 00377277166bac6939d8f72b429301369acaf2d8 |
| Headers | show |
| Series | arm64: Fix the arm64_personality() syscall wrapper redirection | expand |
On Tue, May 28, 2019 at 12:39:34PM +0100, Catalin Marinas wrote: > Following commit 4378a7d4be30 ("arm64: implement syscall wrappers"), the > syscall function names gained the '__arm64_' prefix. Ensure that we > have the correct #define for redirecting a default syscall through a > wrapper. > > Fixes: 4378a7d4be30 ("arm64: implement syscall wrappers") > Cc: <stable@vger.kernel.org> # 4.19.x- > Cc: Mark Rutland <mark.rutland@arm.com> > Cc: Will Deacon <will.deacon@arm.com> > Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> > --- > arch/arm64/kernel/sys.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm64/kernel/sys.c b/arch/arm64/kernel/sys.c > index 6f91e8116514..162a95ed0881 100644 > --- a/arch/arm64/kernel/sys.c > +++ b/arch/arm64/kernel/sys.c > @@ -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 Cheers, I've picked this up as a fix for -rc3. Will
On Tue, May 28, 2019 at 12:39:34PM +0100, Catalin Marinas wrote: > Following commit 4378a7d4be30 ("arm64: implement syscall wrappers"), the > syscall function names gained the '__arm64_' prefix. Ensure that we > have the correct #define for redirecting a default syscall through a > wrapper. > > Fixes: 4378a7d4be30 ("arm64: implement syscall wrappers") > Cc: <stable@vger.kernel.org> # 4.19.x- > Cc: Mark Rutland <mark.rutland@arm.com> > Cc: Will Deacon <will.deacon@arm.com> > Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Evidently I failed to test this case; sorry about that. FWIW: Acked-by: Mark Rutland <mark.rutland@arm.com> Mark. > --- > arch/arm64/kernel/sys.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm64/kernel/sys.c b/arch/arm64/kernel/sys.c > index 6f91e8116514..162a95ed0881 100644 > --- a/arch/arm64/kernel/sys.c > +++ b/arch/arm64/kernel/sys.c > @@ -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
diff --git a/arch/arm64/kernel/sys.c b/arch/arm64/kernel/sys.c index 6f91e8116514..162a95ed0881 100644 --- a/arch/arm64/kernel/sys.c +++ b/arch/arm64/kernel/sys.c @@ -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
Following commit 4378a7d4be30 ("arm64: implement syscall wrappers"), the syscall function names gained the '__arm64_' prefix. Ensure that we have the correct #define for redirecting a default syscall through a wrapper. Fixes: 4378a7d4be30 ("arm64: implement syscall wrappers") Cc: <stable@vger.kernel.org> # 4.19.x- Cc: Mark Rutland <mark.rutland@arm.com> Cc: Will Deacon <will.deacon@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> --- arch/arm64/kernel/sys.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)