From: Miklos Szeredi LD .tmp_vmlinux1 /usr/lib/gcc-lib/i486-linux/3.3.4/../../../libc.a(mktime.o): In function `timelocal': : multiple definition of `mktime' kernel/built-in.o:kernel/time.c:604: first defined here /usr/bin/ld: Warning: size of symbol `mktime' changed from 134 in kernel/built-in.o to 44 in /usr/lib/gcc-lib/i486-linux/3.3.4/../../../libc.a(mktime.o) collect2: ld returned 1 exit status Signed-off-by: Miklos Szeredi Cc: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton --- arch/um/Makefile | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) diff -puN arch/um/Makefile~uml-fix-symbol-for-mktime arch/um/Makefile --- 25/arch/um/Makefile~uml-fix-symbol-for-mktime Fri Jan 13 17:13:21 2006 +++ 25-akpm/arch/um/Makefile Fri Jan 13 17:13:21 2006 @@ -67,7 +67,8 @@ USER_CFLAGS := $(patsubst -D__KERNEL__,, # in CFLAGS. Otherwise, it would cause ld to complain about the two different # errnos. -CFLAGS += -Derrno=kernel_errno -Dsigprocmask=kernel_sigprocmask +CFLAGS += -Derrno=kernel_errno -Dsigprocmask=kernel_sigprocmask \ + -Dmktime=kernel_mktime CFLAGS += $(call cc-option,-fno-unit-at-a-time,) include $(srctree)/$(ARCH_DIR)/Makefile-$(SUBARCH) _