[PATCH] AMD, K7: Fix compilation error when EFI is enabled

From: Borislav Petkov
Date: Thu Mar 29 2012 - 03:39:51 EST

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@xxxxxxxxx>
Cc: Matt Fleming <matt.fleming@xxxxxxxxx>
Signed-off-by: Borislav Petkov <bp@xxxxxxxxx>
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
This enables the kernel to use EFI runtime services that are
available (such as the EFI variable services).

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/