Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / kernel / time.c

diff --git a/kernel/time.c b/kernel/time.c
index b00ddc7..1ea60b2 100644 (file)
--- a/kernel/time.c
+++ b/kernel/time.c
@@ -207,6 +207,8 @@ asmlinkage long sys_settimeofday(struct timeval __user *tv,
  */
 void __attribute__ ((weak)) notify_arch_cmos_timer(void)
 {
+       /* Workaround http://gcc.gnu.org/PR27781 */
+       asm volatile ("");
        return;
 }
 
@@ -523,6 +525,7 @@ EXPORT_SYMBOL(do_gettimeofday);
 
 
 #else
+#ifndef CONFIG_GENERIC_TIME
 /*
  * Simulate gettimeofday using do_gettimeofday which only allows a timeval
  * and therefore only yields usec accuracy
@@ -537,6 +540,7 @@ void getnstimeofday(struct timespec *tv)
 }
 EXPORT_SYMBOL_GPL(getnstimeofday);
 #endif
+#endif
 
 /* Converts Gregorian date to seconds since 1970-01-01 00:00:00.
  * Assumes input in normal date format, i.e. 1980-12-31 23:59:59