diff options
| author | Jeff Dike <jdike@addtoit.com> | 2007-11-01 15:53:26 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-11-16 08:22:57 -0800 |
| commit | 63140953f5b642a12764a913a47a8e6bc97ec4ae (patch) | |
| tree | 806a58406d0d5ef08fc25f5573feaa97f6b8c7aa /arch | |
| parent | 90118e754066f25ff6c168e257ecae536cbb02ac (diff) | |
UML - Fix kernel vs libc symbols clash
commit 818f6ef407b448cef63294b9d0f6f8a2af9cb817 in mainline.
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 <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/um/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile index 989224f21346..c3a399e83368 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile @@ -60,7 +60,8 @@ SYS_DIR := $(ARCH_DIR)/include/sysdep-$(SUBARCH) 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) |