diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-13 20:21:35 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-13 20:21:35 -0400 |
| commit | d27c0d90184a13e9e9f28c38e84f889a259f6b5f (patch) | |
| tree | a933c7b9c9ac96af1787fa11317842557358bf86 /arch | |
| parent | 7453f33b2e07fc2835e24cda0893de83c78d8d76 (diff) | |
| parent | 9e13bcf7e0981f1db0c8c8255ac17d5f898903e9 (diff) | |
Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86/efix fixes from Peter Anvin:
"Two EFI-related Kconfig changes, which happen to touch immediately
adjacent lines in Kconfig and thus collapse to a single patch"
* 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/efi: Enforce CONFIG_RELOCATABLE for EFI boot stub
x86/efi: Fix 3DNow optimization build failure in EFI stub
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 4aafd322e21e..7a7208f16ec3 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -1541,7 +1541,8 @@ config EFI | |||
| 1541 | 1541 | ||
| 1542 | config EFI_STUB | 1542 | config EFI_STUB |
| 1543 | bool "EFI stub support" | 1543 | bool "EFI stub support" |
| 1544 | depends on EFI | 1544 | depends on EFI && !X86_USE_3DNOW |
| 1545 | select RELOCATABLE | ||
| 1545 | ---help--- | 1546 | ---help--- |
| 1546 | This kernel feature allows a bzImage to be loaded directly | 1547 | This kernel feature allows a bzImage to be loaded directly |
| 1547 | by EFI firmware without the use of a bootloader. | 1548 | by EFI firmware without the use of a bootloader. |