diff options
| author | Chen Gang <xili_gchen_5257@hotmail.com> | 2015-05-18 12:37:08 +0800 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2015-05-26 10:01:51 -0700 |
| commit | cceaeddc2edf710141563c65808b5cea6829b925 (patch) | |
| tree | be524c12ee03ceb28d9ed4ddb5457cc1714a6406 | |
| parent | 228fa858e5865c9407b0d6710fd504e0b68bc371 (diff) | |
| download | linux-cceaeddc2edf710141563c65808b5cea6829b925.tar.bz2 | |
alpha: kernel: osf_sys: Set 'kts.tv_nsec' only when 'tv' has effect
The related warning:
CC init/do_mounts.o
arch/alpha/kernel/osf_sys.c: In function 'SyS_osf_settimeofday':
arch/alpha/kernel/osf_sys.c:1028:14: warning: 'kts.tv_nsec' may be used uninitialized in this function [-Wmaybe-uninitialized]
kts.tv_nsec *= 1000;
^
arch/alpha/kernel/osf_sys.c:1016:18: note: 'kts' was declared here
struct timespec kts;
^
Signed-off-by: Chen Gang <gang.chen.5i5j@gmail.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
| -rw-r--r-- | arch/alpha/kernel/osf_sys.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c index e51f578636a5..36dc91ace83a 100644 --- a/arch/alpha/kernel/osf_sys.c +++ b/arch/alpha/kernel/osf_sys.c @@ -1019,14 +1019,13 @@ SYSCALL_DEFINE2(osf_settimeofday, struct timeval32 __user *, tv, if (tv) { if (get_tv32((struct timeval *)&kts, tv)) return -EFAULT; + kts.tv_nsec *= 1000; } if (tz) { if (copy_from_user(&ktz, tz, sizeof(*tz))) return -EFAULT; } - kts.tv_nsec *= 1000; - return do_sys_settimeofday(tv ? &kts : NULL, tz ? &ktz : NULL); } |