The patch titled uml: memcpy export needs to follow host declaration has been added to the -mm tree. Its filename is uml-memcpy-export-needs-to-follow-host-declaration.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: uml: memcpy export needs to follow host declaration From: Jeff Dike <jdike@xxxxxxxxxxx> x86_64 defines either memcpy or __memcpy depending on the gcc version, and it looks like UML needs to follow that in its exporting. Cc: Gabriel C <nix.or.die@xxxxxxxxxxxxxx> Signed-off-by: Jeff Dike <jdike@xxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/um/sys-x86_64/ksyms.c | 4 ++++ 1 file changed, 4 insertions(+) diff -puN arch/um/sys-x86_64/ksyms.c~uml-memcpy-export-needs-to-follow-host-declaration arch/um/sys-x86_64/ksyms.c --- a/arch/um/sys-x86_64/ksyms.c~uml-memcpy-export-needs-to-follow-host-declaration +++ a/arch/um/sys-x86_64/ksyms.c @@ -3,5 +3,9 @@ #include <asm/checksum.h> /*XXX: we need them because they would be exported by x86_64 */ +#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) || __GNUC__ > 4 +EXPORT_SYMBOL(memcpy); +#else EXPORT_SYMBOL(__memcpy); +#endif EXPORT_SYMBOL(csum_partial); _ Patches currently in -mm which might be from jdike@xxxxxxxxxxx are uml-deal-with-host-time-going-backwards.patch uml-deal-with-inaccessible-address-space-start.patch uml-memcpy-export-needs-to-follow-host-declaration.patch uml-stub-needs-to-tolerate-sigwinch.patch linux-next.patch arch-um-kernel-irqc-clean-up-some-functions.patch arch-um-kernel-memc-remove-arch_validate.patch uml-make-several-more-things-static.patch uml-activate_mm-remove-the-dead-pf_borrowed_mm-check.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html