X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=kernel%2Ftime.c;h=dd5ae1162a8f4623a624b2930ac07df52a648180;hb=96d0821cacd095e25a39dfff5232a45b63ed18dd;hp=d4335c1c884c7ae9384be6003e808cd91bdff918;hpb=9acf6597c533f3d5c991f730c6a1be296679018e;p=linux-2.6

diff --git a/kernel/time.c b/kernel/time.c
index d4335c1c88..dd5ae1162a 100644
--- a/kernel/time.c
+++ b/kernel/time.c
@@ -128,7 +128,7 @@ asmlinkage long sys_gettimeofday(struct timeval __user *tv, struct timezone __us
  * as real UNIX machines always do it. This avoids all headaches about
  * daylight saving times and warping kernel clocks.
  */
-inline static void warp_clock(void)
+static inline void warp_clock(void)
 {
 	write_seqlock_irq(&xtime_lock);
 	wall_to_monotonic.tv_sec -= sys_tz.tz_minuteswest * 60;