From 2e5ea3e52c5b7dfde212e3665a5263cc7ffadba5 Mon Sep 17 00:00:00 2001
From: Jeff Dike <jdike@addtoit.com>
Date: Thu, 5 Jun 2008 22:46:13 -0700
Subject: [PATCH] --- yaml --- r: 97796 b: refs/heads/master c:
 8bfd04b974689f700bbd053ad6e66b0a95fb80c9 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/um/sys-x86_64/ksyms.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fb25d7a80f8c..4f563b256c9f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40fb16a360d9c6459afee91dc793c1e3374feb94
+refs/heads/master: 8bfd04b974689f700bbd053ad6e66b0a95fb80c9
diff --git a/trunk/arch/um/sys-x86_64/ksyms.c b/trunk/arch/um/sys-x86_64/ksyms.c
index 6604673a849d..1db2fce00948 100644
--- a/trunk/arch/um/sys-x86_64/ksyms.c
+++ b/trunk/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);