[x86] efi: Fix processor-specific memcpy() build error (Closes: #698581)
svn path=/dists/sid/linux/; revision=19902
This commit is contained in:
parent
0028a0311f
commit
cbb351bb23
|
@ -15,6 +15,7 @@ linux (3.2.39-3) UNRELEASED; urgency=low
|
|||
* test-patches: Clean up all previous test patches, whether or not they
|
||||
were applied
|
||||
* test-patches: Add --fuzz option to allow testing patches that have fuzz
|
||||
* [x86] efi: Fix processor-specific memcpy() build error (Closes: #698581)
|
||||
|
||||
-- Ben Hutchings <ben@decadent.org.uk> Wed, 27 Feb 2013 03:48:30 +0000
|
||||
|
||||
|
|
|
@ -0,0 +1,41 @@
|
|||
From 0f905a43ce955b638139bd84486194770a6a2c08 Mon Sep 17 00:00:00 2001
|
||||
From: Matt Fleming <matt.fleming@intel.com>
|
||||
Date: Tue, 20 Nov 2012 13:07:46 +0000
|
||||
Subject: [PATCH] x86, efi: Fix processor-specific memcpy() build error
|
||||
|
||||
Building for Athlon/Duron/K7 results in the following build error,
|
||||
|
||||
arch/x86/boot/compressed/eboot.o: In function `__constant_memcpy3d':
|
||||
eboot.c:(.text+0x385): undefined reference to `_mmx_memcpy'
|
||||
arch/x86/boot/compressed/eboot.o: In function `efi_main':
|
||||
eboot.c:(.text+0x1a22): undefined reference to `_mmx_memcpy'
|
||||
|
||||
because the boot stub code doesn't link with the kernel proper, and
|
||||
therefore doesn't have access to the 3DNow version of memcpy. So,
|
||||
follow the example of misc.c and #undef memcpy so that we use the
|
||||
version provided by misc.c.
|
||||
|
||||
See https://bugzilla.kernel.org/show_bug.cgi?id=50391
|
||||
|
||||
Reported-by: Al Viro <viro@zeniv.linux.org.uk>
|
||||
Reported-by: Ryan Underwood <nemesis@icequake.net>
|
||||
Cc: H. Peter Anvin <hpa@zytor.com>
|
||||
Cc: stable@vger.kernel.org
|
||||
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
|
||||
---
|
||||
arch/x86/boot/compressed/eboot.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
|
||||
index c760e07..e87b0ca 100644
|
||||
--- a/arch/x86/boot/compressed/eboot.c
|
||||
+++ b/arch/x86/boot/compressed/eboot.c
|
||||
@@ -12,6 +12,8 @@
|
||||
#include <asm/setup.h>
|
||||
#include <asm/desc.h>
|
||||
|
||||
+#undef memcpy /* Use memcpy from misc.c */
|
||||
+
|
||||
#include "eboot.h"
|
||||
|
||||
static efi_system_table_t *sys_table;
|
|
@ -631,3 +631,4 @@ bugfix/all/mm-fix-pageblock-bitmap-allocation.patch
|
|||
bugfix/all/USB-usb-storage-unusual_devs-update-for-Super-TOP-SA.patch
|
||||
debian/x86-efi-avoid-abi-change-in-3.2.38.patch
|
||||
bugfix/all/vhost-fix-length-for-cross-region-descriptor.patch
|
||||
features/x86/efi-stub/0019-x86-efi-Fix-processor-specific-memcpy-build-error.patch
|
||||
|
|
Loading…
Reference in New Issue