Commit:     1a65f493c335abc3822291b52f3565776ce39a1b
Parent:     0d786d4a2773f06a791e8c3730d049077fb81df6
Author:     Jeff Dike <[EMAIL PROTECTED]>
AuthorDate: Mon Jul 23 18:43:46 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Tue Jul 24 12:24:58 2007 -0700

    uml: fix string exporting on UML/i386
    In 2.6.23-rc1, i386 fiddled its string support such that UML started getting
    undefined references from modules.  The UML asm/string.h was including the
    i386 string.h, which defined __HAVE_ARCH_STR*, but the corresponding
    implementations weren't being pulled in.
    This is fixed by adding arch/i386/lib/string.h to the list of host
    architecture files to be pulled in to UML.
    A complication is that the libc exports file assumed that the generic strlen
    and strstr weren't in use (i.e.  __HAVE_ARCH_STR is defined), then they 
    exported.  This is untrue for strlen, which is exported in either case, so
    this logic is not needed.
    Signed-off-by: Jeff Dike <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 arch/um/os-Linux/user_syms.c |    5 +----
 arch/um/sys-i386/Makefile    |    2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/arch/um/os-Linux/user_syms.c b/arch/um/os-Linux/user_syms.c
index 419b2d5..4c37b1b 100644
--- a/arch/um/os-Linux/user_syms.c
+++ b/arch/um/os-Linux/user_syms.c
@@ -19,10 +19,7 @@ extern void *memmove(void *, const void *, size_t);
 extern void *memset(void *, int, size_t);
 extern int printf(const char *, ...);
-/* If they're not defined, the export is included in lib/string.c.*/
+/* If it's not defined, the export is included in lib/string.c.*/
diff --git a/arch/um/sys-i386/Makefile b/arch/um/sys-i386/Makefile
index 098720b..d6b3ecd 100644
--- a/arch/um/sys-i386/Makefile
+++ b/arch/um/sys-i386/Makefile
@@ -4,7 +4,7 @@ obj-y = bug.o bugs.o checksum.o delay.o fault.o ksyms.o ldt.o 
ptrace.o \
 obj-$(CONFIG_MODE_SKAS) += stub.o stub_segv.o
-subarch-obj-y = lib/bitops.o lib/semaphore.o
+subarch-obj-y = lib/bitops.o lib/semaphore.o lib/string.o
 subarch-obj-$(CONFIG_HIGHMEM) += mm/highmem.o
 subarch-obj-$(CONFIG_MODULES) += kernel/module.o
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to