Commit-ID: 5f403fa9de5b3bb1309ec5f72b1e52e5b51321d4
Gitweb: http://git.kernel.org/tip/5f403fa9de5b3bb1309ec5f72b1e52e5b51321d4
Author: Gustavo F. Padovan <gustavo@xxxxxxxxxxxxxxxxx>
AuthorDate: Sun, 15 Feb 2009 21:48:56 -0300
Commit: H. Peter Anvin <hpa@xxxxxxxxx>
CommitDate: Fri, 27 Feb 2009 20:57:47 -0800
x86, fixmap: add CONFIG_EFI
Impact: new fixmap allocation
FIX_EFI_IO_MAP_FIRST_PAGE is used only when EFI is enabled.
Signed-off-by: Gustavo F. Padovan <gustavo@xxxxxxxxxxxxxxxxx>
Acked-by: Glauber Costa <gcosta@xxxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
---
arch/x86/include/asm/fixmap_64.h | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/arch/x86/include/asm/fixmap_64.h b/arch/x86/include/asm/fixmap_64.h
index 7a518ec..baff6d0 100644
--- a/arch/x86/include/asm/fixmap_64.h
+++ b/arch/x86/include/asm/fixmap_64.h
@@ -16,7 +16,9 @@
#include <asm/apicdef.h>
#include <asm/page.h>
#include <asm/vsyscall.h>
+#ifdef CONFIG_EFI
#include <asm/efi.h>
+#endif
/*
* Here we define all the compile-time 'special' virtual
@@ -47,9 +49,11 @@ enum fixed_addresses {
FIX_IO_APIC_BASE_0,
FIX_IO_APIC_BASE_END = FIX_IO_APIC_BASE_0 + MAX_IO_APICS - 1,
#endif
+#ifdef CONFIG_EFI
FIX_EFI_IO_MAP_LAST_PAGE,
FIX_EFI_IO_MAP_FIRST_PAGE = FIX_EFI_IO_MAP_LAST_PAGE
+ MAX_EFI_IO_PAGES - 1,
+#endif
#ifdef CONFIG_PARAVIRT
FIX_PARAVIRT_BOOTMAP,
#endif
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|