diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:27:53 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:27:53 +0200 |
| commit | c54f9da1c8ceee19436430afac0798a989eb886d (patch) | |
| tree | 412f51c3f2641e4205b767cec95ce6107cd39d36 /arch/x86/vdso | |
| parent | a2eddfa95919a730e0e5ed17e9c303fe5ba249cd (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into x86/irqstats
Diffstat (limited to 'arch/x86/vdso')
| -rw-r--r-- | arch/x86/vdso/vclock_gettime.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/vdso/vclock_gettime.c b/arch/x86/vdso/vclock_gettime.c index 23476c2ebfc..efa2ba7c600 100644 --- a/arch/x86/vdso/vclock_gettime.c +++ b/arch/x86/vdso/vclock_gettime.c @@ -106,9 +106,9 @@ int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz) do_realtime((struct timespec *)tv); tv->tv_usec /= 1000; if (unlikely(tz != NULL)) { - /* This relies on gcc inlining the memcpy. We'll notice - if it ever fails to do so. */ - memcpy(tz, >od->sys_tz, sizeof(struct timezone)); + /* Avoid memcpy. Some old compilers fail to inline it */ + tz->tz_minuteswest = gtod->sys_tz.tz_minuteswest; + tz->tz_dsttime = gtod->sys_tz.tz_dsttime; } return 0; } |