diff options
| author | Jaroslav Kysela <perex@suse.cz> | 2006-02-01 07:08:56 -0500 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2006-02-01 07:08:56 -0500 |
| commit | 847b9d01474f710e7a018186917d05e59e258309 (patch) | |
| tree | c0da8777ce350c4b048aa6ed2c41fdd109c42e92 /kernel/time.c | |
| parent | d1d051b28e9d3c3bed0bd15a2b49df3d04f7768f (diff) | |
| parent | a6df590dd8b7644c8e298e3b13442bcd6ceeb739 (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'kernel/time.c')
| -rw-r--r-- | kernel/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/time.c b/kernel/time.c index 7477b1d2079e..1f23e683d6aa 100644 --- a/kernel/time.c +++ b/kernel/time.c | |||
| @@ -155,7 +155,7 @@ int do_sys_settimeofday(struct timespec *tv, struct timezone *tz) | |||
| 155 | static int firsttime = 1; | 155 | static int firsttime = 1; |
| 156 | int error = 0; | 156 | int error = 0; |
| 157 | 157 | ||
| 158 | if (!timespec_valid(tv)) | 158 | if (tv && !timespec_valid(tv)) |
| 159 | return -EINVAL; | 159 | return -EINVAL; |
| 160 | 160 | ||
| 161 | error = security_settime(tv, tz); | 161 | error = security_settime(tv, tz); |