2007-08-02 21:07:52

by Jeff Dike

[permalink] [raw]
Subject: [PATCH 2/6] UML - Fix an IPV6 libc vs kernel symbol clash

On some systems, with IPV6 configured, there is a clash between the
kernel's in6addr_any and the one in libc.

This is handled in the usual (gross) way of defining the kernel symbol
out of the way on the gcc command line.

Signed-off-by: Jeff Dike <[email protected]>
--
arch/um/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Index: linux-2.6.21-mm/arch/um/Makefile
===================================================================
--- linux-2.6.21-mm.orig/arch/um/Makefile 2007-08-02 16:43:17.000000000 -0400
+++ linux-2.6.21-mm/arch/um/Makefile 2007-08-02 16:43:22.000000000 -0400
@@ -60,7 +60,8 @@ SYS_DIR := $(ARCH_DIR)/include/sysdep-$

CFLAGS += $(CFLAGS-y) -D__arch_um__ -DSUBARCH=\"$(SUBARCH)\" \
$(ARCH_INCLUDE) $(MODE_INCLUDE) -Dvmap=kernel_vmap \
- -Din6addr_loopback=kernel_in6addr_loopback
+ -Din6addr_loopback=kernel_in6addr_loopback \
+ -Din6addr_any=kernel_in6addr_any

AFLAGS += $(ARCH_INCLUDE)