* [PATCH 2/4] UML - Fix kernel vs libc symbols clash
@ 2007-11-01 19:53 Jeff Dike
2007-11-14 18:58 ` patch uml-fix-kernel-vs-libc-symbols-clash.patch queued to -stable tree gregkh
0 siblings, 1 reply; 2+ messages in thread
From: Jeff Dike @ 2007-11-01 19:53 UTC (permalink / raw)
To: stable; +Cc: LKML, uml-devel
commit 2a772652c3971745228a2e40e6575ae594c88365
Author: Jeff Dike <jdike@addtoit.com>
Date: Tue Oct 16 01:26:45 2007 -0700
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>
---
arch/um/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/um/Makefile b/arch/um/Makefile
index 989224f..c3a399e 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)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* patch uml-fix-kernel-vs-libc-symbols-clash.patch queued to -stable tree
2007-11-01 19:53 [PATCH 2/4] UML - Fix kernel vs libc symbols clash Jeff Dike
@ 2007-11-14 18:58 ` gregkh
0 siblings, 0 replies; 2+ messages in thread
From: gregkh @ 2007-11-14 18:58 UTC (permalink / raw)
To: jdike, akpm, gregkh, jdike, linux-kernel, torvalds,
user-mode-linux-devel
Cc: stable, stable-commits
This is a note to let you know that we have just queued up the patch titled
Subject: UML - Fix kernel vs libc symbols clash
to the 2.6.23-stable tree. Its filename is
uml-fix-kernel-vs-libc-symbols-clash.patch
A git repo of this tree can be found at
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
>From stable-bounces@linux.kernel.org Thu Nov 1 12:54:06 2007
From: Jeff Dike <jdike@addtoit.com>
Date: Thu, 1 Nov 2007 15:53:26 -0400
Subject: UML - Fix kernel vs libc symbols clash
To: stable@kernel.org
Cc: LKML <linux-kernel@vger.kernel.org>, uml-devel <user-mode-linux-devel@lists.sourceforge.net>
Message-ID: <20071101195326.GA8888@c2.user-mode-linux.org>
Content-Disposition: inline
From: Jeff Dike <jdike@addtoit.com>
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>
---
arch/um/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -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)
Patches currently in stable-queue which might be from jdike@addtoit.com are
queue-2.6.23/uml-stop-using-libc-asm-page.h.patch
queue-2.6.23/uml-fix-kernel-vs-libc-symbols-clash.patch
queue-2.6.23/uml-stop-using-libc-asm-user.h.patch
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-11-14 18:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-11-01 19:53 [PATCH 2/4] UML - Fix kernel vs libc symbols clash Jeff Dike
2007-11-14 18:58 ` patch uml-fix-kernel-vs-libc-symbols-clash.patch queued to -stable tree gregkh
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).