[PATCH] powerpc/PCI hotplug: merge rpaphp_enable_pci_slot()

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

diff --git a/kernel/time.c b/kernel/time.c
index 169e8329e0b63ba59ce29f438dd90f182280ce03..1f23e683d6aa01da497a86a8cd5ac6804ef5d6fe 100644 (file)
--- a/kernel/time.c
+++ b/kernel/time.c
@@ -29,6 +29,7 @@
 
 #include <linux/module.h>
 #include <linux/timex.h>
+#include <linux/capability.h>
 #include <linux/errno.h>
 #include <linux/smp_lock.h>
 #include <linux/syscalls.h>
@@ -154,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);