[PATCH] uml: fix symbol for mktime

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 <miklos@szeredi.hu>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Miklos Szeredi and committed by Linus Torvalds ee7be5de 858119e1

+2 -1
+2 -1
arch/um/Makefile
··· 67 67 # in CFLAGS. Otherwise, it would cause ld to complain about the two different 68 68 # errnos. 69 69 70 - CFLAGS += -Derrno=kernel_errno -Dsigprocmask=kernel_sigprocmask 70 + CFLAGS += -Derrno=kernel_errno -Dsigprocmask=kernel_sigprocmask \ 71 + -Dmktime=kernel_mktime 71 72 CFLAGS += $(call cc-option,-fno-unit-at-a-time,) 72 73 73 74 include $(srctree)/$(ARCH_DIR)/Makefile-$(SUBARCH)