diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-02 11:50:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-02 11:50:58 -0800 |
| commit | 46d6b7becb1d5a8e697db786590c19e4067a975a (patch) | |
| tree | 8166d7d3bc10822b251fe8b917f1e3f2762742db | |
| parent | Merge tag 'leds-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds (diff) | |
| parent | sparc64: fix adjtimex regression (diff) | |
| download | wireguard-linux-46d6b7becb1d5a8e697db786590c19e4067a975a.tar.xz wireguard-linux-46d6b7becb1d5a8e697db786590c19e4067a975a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
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
| -rw-r--r-- | arch/sparc/kernel/sys_sparc_64.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c index 34917617f258..6b92fadb6ec7 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)) { |