Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98105d47 authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds
Browse files

[PATCH] uml: comments about libc-conflict guards 



While fixing myself the mktime conflict (which someone already merged), I also
improved a few comments.  Merge them up.

Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 0c19585b

arch/um/Makefile

+9 −5
Original line number Diff line number Diff line
@@ -47,10 +47,13 @@ ARCH_INCLUDE += -I$(srctree)/$(ARCH_DIR)/include 
endif

SYS_DIR		:= $(ARCH_DIR)/include/sysdep-$(SUBARCH)



# -Dvmap=kernel_vmap affects everything, and prevents anything from

# referencing the libpcap.o symbol so named.

# -Dvmap=kernel_vmap prevents anything from referencing the libpcap.o symbol so

# named - it's a common symbol in libpcap, so we get a binary which crashes.

#

# Same things for in6addr_loopback - found in libc.

# Same things for in6addr_loopback and mktime - found in libc. For these two we

# only get link-time error, luckily.

#

# These apply to USER_CFLAGS to.



CFLAGS += $(CFLAGS-y) -D__arch_um__ -DSUBARCH=\"$(SUBARCH)\"	\

	$(ARCH_INCLUDE) $(MODE_INCLUDE) -Dvmap=kernel_vmap	\
@@ -66,6 +69,7 @@ USER_CFLAGS := $(patsubst -D__KERNEL__,,$(USER_CFLAGS)) $(ARCH_INCLUDE) \ 
# kernel_errno to separate them from the libc errno.  This allows -fno-common

# in CFLAGS.  Otherwise, it would cause ld to complain about the two different

# errnos.

# These apply to kernelspace only.



CFLAGS += -Derrno=kernel_errno -Dsigprocmask=kernel_sigprocmask \

	-Dmktime=kernel_mktime