aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/vdso
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-06-16 05:15:58 -0400
committerIngo Molnar <mingo@elte.hu>2008-06-16 05:15:58 -0400
commite765ee90da62535ac7d7a97f2464f9646539d683 (patch)
tree7a9cecce5aab958938e9a3bf46c2302d6af1958c /arch/x86/vdso
parenta4500b84c51645bbc86be3ca84f2252b7ada060f (diff)
parent066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff)
Merge branch 'linus' into tracing/ftrace
Diffstat (limited to 'arch/x86/vdso')
-rw-r--r--arch/x86/vdso/vclock_gettime.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/vdso/vclock_gettime.c b/arch/x86/vdso/vclock_gettime.c
index 5cb8f754c52d..1ef0f90813d6 100644
--- a/arch/x86/vdso/vclock_gettime.c
+++ b/arch/x86/vdso/vclock_gettime.c
@@ -107,9 +107,9 @@ notrace int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz)
107 do_realtime((struct timespec *)tv); 107 do_realtime((struct timespec *)tv);
108 tv->tv_usec /= 1000; 108 tv->tv_usec /= 1000;
109 if (unlikely(tz != NULL)) { 109 if (unlikely(tz != NULL)) {
110 /* This relies on gcc inlining the memcpy. We'll notice 110 /* Avoid memcpy. Some old compilers fail to inline it */
111 if it ever fails to do so. */ 111 tz->tz_minuteswest = gtod->sys_tz.tz_minuteswest;
112 memcpy(tz, &gtod->sys_tz, sizeof(struct timezone)); 112 tz->tz_dsttime = gtod->sys_tz.tz_dsttime;
113 } 113 }
114 return 0; 114 return 0;
115 } 115 }