From: Andrew Morton <akpm@osdl.org>

it's a losing battle.

Cc: John Stultz <johnstul@us.ibm.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Andi Kleen <ak@muc.de>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 include/linux/clocksource.h |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff -puN include/linux/clocksource.h~generic-vsyscall-gtod-support-for-generic_time-tidy include/linux/clocksource.h
--- a/include/linux/clocksource.h~generic-vsyscall-gtod-support-for-generic_time-tidy
+++ a/include/linux/clocksource.h
@@ -187,7 +187,9 @@ struct clocksource* clocksource_get_next
 #ifdef CONFIG_GENERIC_TIME_VSYSCALL
 extern void update_vsyscall(struct timespec *ts, struct clocksource *c);
 #else
-#define update_vsyscall(now, c) do { } while(0)
+static inline void update_vsyscall(struct timespec *ts, struct clocksource *c)
+{
+}
 #endif
 
 #endif /* _LINUX_CLOCKSOURCE_H */
_