From: Andrew Morton <akpm@osdl.org>

kernel/timer.c: In function `update_wall_time':
kernel/timer.c:1207: error: syntax error before "do"
kernel/timer.c: At top level:
kernel/timer.c:1210: warning: type defaults to `int' in declaration of `hrtimer_clock_notify'
kernel/timer.c:1210: warning: function declaration isn't a prototype
kernel/timer.c:1210: error: conflicting types for 'hrtimer_clock_notify'
include/linux/hrtimer.h:261: error: previous definition of 'hrtimer_clock_notify' was here
kernel/timer.c:1210: warning: data definition has no type or storage class
kernel/timer.c:1211: warning: type defaults to `int' in declaration of `clocksource_calculate_interval'
kernel/timer.c:1211: warning: parameter names (without types) in function declaration
kernel/timer.c:1211: error: conflicting types for 'clocksource_calculate_interval'
include/linux/clocksource.h:163: error: previous definition of 'clocksource_calculate_interval' was here
kernel/timer.c:1211: warning: data definition has no type or storage class
kernel/timer.c:1212: error: syntax error before '}' token

Cc: Daniel Walker <dwalker@mvista.com>
Cc: John Stultz <johnstul@us.ibm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 kernel/timer.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff -puN kernel/timer.c~clocksource-small-cleanup-2-fix kernel/timer.c
--- a/kernel/timer.c~clocksource-small-cleanup-2-fix
+++ a/kernel/timer.c
@@ -925,7 +925,10 @@ static int change_clocksource(void)
 	return 0;
 }
 #else
-#define change_clocksource()	do { 0; } while(0)
+static inline int change_clocksource(void)
+{
+	return 0;
+}
 #endif
 
 /**
_