Commit a1289643 authored May 14, 2008 by Andi Kleen Committed by Thomas Gleixner May 23, 2008

x86: use explicit copy in vdso_gettimeofday()



Jeremy's gcc 3.4 seems to be unable to inline a 8 byte memcpy.  But the
vdso doesn't support external references.  Copy the structure members
of struct timezone explicitely instead.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parent 2ddfd20e

arch/x86/vdso/vclock_gettime.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -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, &gtod->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;
		}