ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2020-02-02 11:50:58 -08:00
parent 545ae66582 11648b8339
commit 46d6b7becb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/sparc/kernel/sys_sparc_64.c
View File

@@ -551,7 +551,7 @@ out_unlock:
SYSCALL_DEFINE1(sparc_adjtimex, struct __kernel_timex __user *, txc_p) SYSCALL_DEFINE1(sparc_adjtimex, struct __kernel_timex __user *, txc_p)
{ {
struct __kernel_timex txc; struct __kernel_timex txc;
struct __kernel_old_timeval *tv = (void *)&txc_p->time; struct __kernel_old_timeval *tv = (void *)&txc.time;
int ret; int ret;
/* Copy the user data space into the kernel copy /* 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 __user *, txc_p)
{ {
struct __kernel_timex txc; struct __kernel_timex txc;
struct __kernel_old_timeval *tv = (void *)&txc_p->time; struct __kernel_old_timeval *tv = (void *)&txc.time;
int ret; int ret;
if (!IS_ENABLED(CONFIG_POSIX_TIMERS)) { if (!IS_ENABLED(CONFIG_POSIX_TIMERS)) {