Commit 46d6b7be authored by Linus Torvalds's avatar Linus Torvalds

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
parents 545ae665 11648b83
...@@ -551,7 +551,7 @@ SYSCALL_DEFINE2(getdomainname, char __user *, name, int, len) ...@@ -551,7 +551,7 @@ SYSCALL_DEFINE2(getdomainname, char __user *, name, int, len)
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, ...@@ -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)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment