Re: K7/Athlon Optimization Causes Build Fail on Kernel 3.3 i686

[Borislav Petkov <bp@alien8.de>]

On Thu, Mar 29, 2012 at 09:14:15AM +0100, Matt Fleming wrote:
> Hmm... I think what might make more sense is to make EFI (not EFI_STUB)
> depend on !MK7, since I doubt people actually need both MK7 and any EFI
> firmware support.

... and EFI_STUB depends on EFI, yeah, true story.

Here's an updated patch, Trevor pls try this one instead, thanks.

--
>From b3419ea2f2d38e758022bab17855eb9df8ee43c0 Mon Sep 17 00:00:00 2001
From: Borislav Petkov <bp@alien8.de>
Date: Thu, 29 Mar 2012 09:39:51 +0200
Subject: [PATCH] AMD, K7: Fix compilation error when EFI is enabled

Trevor Turner reported that building the 3.3 kernel on his K7 box fails.
Reproducing the issue locally got us also the exact build error:

arch/x86/boot/compressed/eboot.o: In function `efi_main':
eboot.c:(.text+0x1530): undefined reference to `_mmx_memcpy'
eboot.c:(.text+0x17d0): undefined reference to `_mmx_memcpy'
make[2]: *** [arch/x86/boot/compressed/vmlinux] Error 1
make[1]: *** [arch/x86/boot/compressed/vmlinux] Error 2
make[1]: *** Waiting for unfinished jobs....

due to the fact that K7 has special MMX memcpy routines which EFI uses
through memcpy but is not linked against them thus the build failure.

Instead of making this work, we decided to make EFI and K7 mutually
exclusive since they're from different epochs anyway. The patch below
fixes that.

Reported-by: Trevor Turner <turn3r.tr3v0r@gmail.com>
Cc: Matt Fleming <matt.fleming@intel.com>
Signed-off-by: Borislav Petkov <bp@alien8.de>
---
 arch/x86/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 5bed94e189fa..95d2b7c9b74a 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1502,7 +1502,7 @@ config ARCH_RANDOM
 
 config EFI
 	bool "EFI runtime service support"
-	depends on ACPI
+	depends on ACPI && !MK7
 	---help---
 	  This enables the kernel to use EFI runtime services that are
 	  available (such as the EFI variable services).
-- 
1.7.9


-- 
Regards/Gruss,
Boris.