diff options
| author | Jeff Dike <jdike@addtoit.com> | 2007-10-16 04:26:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 12:43:04 -0400 |
| commit | 818f6ef407b448cef63294b9d0f6f8a2af9cb817 (patch) | |
| tree | a1c26590b50c6ef02962e733cf9822aa4df02722 /arch/um/Makefile | |
| parent | 71f926f2ea61994470a53c9e11d3ef993197cada (diff) | |
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>
Diffstat (limited to 'arch/um/Makefile')
| -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 0666729eb976..3efc4ffb32a4 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile | |||
| @@ -60,7 +60,8 @@ SYS_DIR := $(ARCH_DIR)/include/sysdep-$(SUBARCH) | |||
| 60 | 60 | ||
| 61 | CFLAGS += $(CFLAGS-y) -D__arch_um__ -DSUBARCH=\"$(SUBARCH)\" \ | 61 | CFLAGS += $(CFLAGS-y) -D__arch_um__ -DSUBARCH=\"$(SUBARCH)\" \ |
| 62 | $(ARCH_INCLUDE) $(MODE_INCLUDE) -Dvmap=kernel_vmap \ | 62 | $(ARCH_INCLUDE) $(MODE_INCLUDE) -Dvmap=kernel_vmap \ |
| 63 | -Din6addr_loopback=kernel_in6addr_loopback | 63 | -Din6addr_loopback=kernel_in6addr_loopback \ |
| 64 | -Din6addr_any=kernel_in6addr_any | ||
| 64 | 65 | ||
| 65 | AFLAGS += $(ARCH_INCLUDE) | 66 | AFLAGS += $(ARCH_INCLUDE) |
| 66 | 67 | ||