Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

46d6b7be · Linus Torvalds <[email protected]> · 2020-02-02 11:50:58 -08:00

Pull sparc fix from David Miller:
 "adjtimex regression fix from Arnd"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc64: fix adjtimex regression

Commit: 46d6b7becb1d5a8e697db786590c19e4067a975a
Parents: 545ae665 · 11648b83

Merge commit. Changes below are compared with the first parent: 545ae665.

Changes

1 files changed · +2 −2

File	Status	Add	Del	Content
arch/sparc/kernel/sys_sparc_64.c	modified	+2	−2	View file

arch/sparc/kernel/sys_sparc_64.c

View file

diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
index 3491761..6b92fad 100644
--- a/arch/sparc/kernel/sys_sparc_64.c
+++ b/arch/sparc/kernel/sys_sparc_64.c
@@ -551,7 +551,7 @@ out_unlock:
 SYSCALL_DEFINE1(sparc_adjtimex, struct __kernel_timex __user *, txc_p)
 {
 	struct __kernel_timex txc;
-	struct __kernel_old_timeval *tv = (void *)&txc_p->time;
+	struct __kernel_old_timeval *tv = (void *)&txc.time;
 	int ret;
 
 	/* Copy the user data space into the kernel copy
@@ -576,7 +576,7 @@ SYSCALL_DEFINE2(sparc_clock_adjtime, const clockid_t, which_clock,
 		struct __kernel_timex __user *, txc_p)
 {
 	struct __kernel_timex txc;
-	struct __kernel_old_timeval *tv = (void *)&txc_p->time;
+	struct __kernel_old_timeval *tv = (void *)&txc.time;
 	int ret;
 
 	if (!IS_ENABLED(CONFIG_POSIX_TIMERS)) {