From: Miklos Szeredi ktimers-kt2-uml-fix.patch got dropped from -mm on the ktimer rework, but is still needed to make UML compile. LD .tmp_vmlinux1 arch/um/kernel/built-in.o(.text+0x577a): In function `do_gettimeofday': arch/um/kernel/time.c:128: undefined reference to `clock_was_set' collect2: ld returned 1 exit status ktimers patch left all clock_was_set() calls in place presumably because they will be reused at a later time (?). So this patch does the same. Signed-off-by: Miklos Szeredi Cc: Ingo Molnar Cc: Thomas Gleixner Signed-off-by: Andrew Morton --- arch/um/kernel/time.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff -puN arch/um/kernel/time.c~hrtimer-convert-posix-timers-completely-fix arch/um/kernel/time.c --- 25/arch/um/kernel/time.c~hrtimer-convert-posix-timers-completely-fix Fri Dec 9 13:42:44 2005 +++ 25-akpm/arch/um/kernel/time.c Fri Dec 9 13:42:44 2005 @@ -114,8 +114,8 @@ void time_init(void) wall_to_monotonic.tv_nsec = -now.tv_nsec; } -/* Declared in linux/time.h, which can't be included here */ -extern void clock_was_set(void); +/* Defined in linux/ktimer.h, which can't be included here */ +#define clock_was_set() do { } while (0) void do_gettimeofday(struct timeval *tv) { _