From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from sc8-sf-mx1-b.sourceforge.net ([10.3.1.91] helo=mail.sourceforge.net) by sc8-sf-list1-new.sourceforge.net with esmtp (Exim 4.43) id 1K3bmm-00062e-7M for user-mode-linux-devel@lists.sourceforge.net; Tue, 03 Jun 2008 12:03:08 -0700 Received: from [198.99.130.12] (helo=saraswathi.solana.com) by mail.sourceforge.net with esmtps (TLSv1:AES256-SHA:256) (Exim 4.44) id 1K3bml-0008O6-JD for user-mode-linux-devel@lists.sourceforge.net; Tue, 03 Jun 2008 12:03:08 -0700 Date: Tue, 3 Jun 2008 15:02:37 -0400 From: Jeff Dike Message-ID: <20080603190237.GA9517@c2.user-mode-linux.org> MIME-Version: 1.0 Content-Disposition: inline Subject: [uml-devel] [PATCH 4/6] UML - memcpy export needs to follow host declaration List-Id: The user-mode Linux development list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: user-mode-linux-devel-bounces@lists.sourceforge.net Errors-To: user-mode-linux-devel-bounces@lists.sourceforge.net To: Andrew Morton , LKML , uml-devel Cc: Gabriel C 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 Signed-off-by: Jeff Dike --- arch/um/sys-x86_64/ksyms.c | 4 ++++ 1 file changed, 4 insertions(+) Index: linux-2.6-git/arch/um/sys-x86_64/ksyms.c =================================================================== --- linux-2.6-git.orig/arch/um/sys-x86_64/ksyms.c 2008-05-28 12:32:34.000000000 -0400 +++ linux-2.6-git/arch/um/sys-x86_64/ksyms.c 2008-06-02 15:49:43.000000000 -0400 @@ -3,5 +3,9 @@ #include /*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); ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ User-mode-linux-devel mailing list User-mode-linux-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758675AbYFCTEW (ORCPT ); Tue, 3 Jun 2008 15:04:22 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755047AbYFCTEF (ORCPT ); Tue, 3 Jun 2008 15:04:05 -0400 Received: from saraswathi.solana.com ([198.99.130.12]:58518 "EHLO saraswathi.solana.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754951AbYFCTED (ORCPT ); Tue, 3 Jun 2008 15:04:03 -0400 Date: Tue, 3 Jun 2008 15:02:37 -0400 From: Jeff Dike To: Andrew Morton , LKML , uml-devel Cc: Gabriel C Subject: [PATCH 4/6] UML - memcpy export needs to follow host declaration Message-ID: <20080603190237.GA9517@c2.user-mode-linux.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.17 (2007-11-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Signed-off-by: Jeff Dike --- arch/um/sys-x86_64/ksyms.c | 4 ++++ 1 file changed, 4 insertions(+) Index: linux-2.6-git/arch/um/sys-x86_64/ksyms.c =================================================================== --- linux-2.6-git.orig/arch/um/sys-x86_64/ksyms.c 2008-05-28 12:32:34.000000000 -0400 +++ linux-2.6-git/arch/um/sys-x86_64/ksyms.c 2008-06-02 15:49:43.000000000 -0400 @@ -3,5 +3,9 @@ #include /*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);