diff options
| author | Jeff Dike <jdike@addtoit.com> | 2007-10-16 08:27:27 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 16:43:08 (GMT) |
| commit | 5f734614fc6218db352d26571ab4d1604620199c (patch) | |
| tree | ff1323d87862c0522ef83568543f46b46eac941a /arch/um/include | |
| parent | b160fb6309dc907cbd8849e549d83badb86dd35b (diff) | |
| download | linux-5f734614fc6218db352d26571ab4d1604620199c.tar.xz | |
uml: time build fix
Put back an implementation of timeval_to_ns in arch/um/os-Linux/time.c.
tglx pointed out in his review of tickless support that there was a
perfectly good implementation of it in linux/time.h. The problem is that
this is userspace code which can't pull in kernel headers and there doesn't
seem to be a libc version.
So, I'm copying the version from linux/time.h rather than resurrecting my
version. This causes some declaration changes as it now returns a signed
value rather than an unsigned value.
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/include')
| -rw-r--r-- | arch/um/include/os.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/include/os.h b/arch/um/include/os.h index 91642e4..a1b0804 100644 --- a/arch/um/include/os.h +++ b/arch/um/include/os.h @@ -254,9 +254,9 @@ extern void os_dump_core(void); extern void idle_sleep(unsigned long long nsecs); extern int set_interval(void); extern int timer_one_shot(int ticks); -extern unsigned long long disable_timer(void); +extern long long disable_timer(void); extern void uml_idle_timer(void); -extern unsigned long long os_nsecs(void); +extern long long os_nsecs(void); /* skas/mem.c */ extern long run_syscall_stub(struct mm_id * mm_idp, |