diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-23 00:37:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-23 00:37:07 -0700 |
| commit | aea40b2905d269b11a7382d84e9cb0f4c067922e (patch) | |
| tree | 3cf16968659fa6a43a2b5e28ece06dc305d320b2 /kernel/timer.c | |
| parent | 01a17cfd0ccd0bea05f4000f4560807507fbed84 (diff) | |
| parent | 9c9dada1d5cfd06f06b00ef84ef01839b9ac65ed (diff) | |
Merge bk://linux-ntfs.bkbits.net/ntfs-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'kernel/timer.c')
| -rw-r--r-- | kernel/timer.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index 4850abbeacdc..79db45d06bac 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -1241,8 +1241,7 @@ asmlinkage long sys_sysinfo(struct sysinfo __user *info) * too. */ - do_gettimeofday((struct timeval *)&tp); - tp.tv_nsec *= NSEC_PER_USEC; + getnstimeofday(&tp); tp.tv_sec += wall_to_monotonic.tv_sec; tp.tv_nsec += wall_to_monotonic.tv_nsec; if (tp.tv_nsec - NSEC_PER_SEC >= 0) { |