Merge git://oss.sgi.com:8090/oss/git/xfs-2.6

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

diff --git a/kernel/time.c b/kernel/time.c
index 7477b1d..1f23e68 100644 (file)
--- a/kernel/time.c
+++ b/kernel/time.c
@@ -155,7 +155,7 @@ int do_sys_settimeofday(struct timespec *tv, struct timezone *tz)
        static int firsttime = 1;
        int error = 0;
 
-       if (!timespec_valid(tv))
+       if (tv && !timespec_valid(tv))
                return -EINVAL;
 
        error = security_settime(tv, tz);