From: Gustavo F. Padovan <gustavo@las.ic.unicamp.br>
Date: Mon, 16 Feb 2009 00:48:56 +0000 (-0300)
Subject: x86, fixmap: add CONFIG_EFI
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5f403fa9de5b3bb1309ec5f72b1e52e5b51321d4;p=linux-2.6-omap-h63xx.git

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@las.ic.unicamp.br>
Acked-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---

diff --git a/arch/x86/include/asm/fixmap_64.h b/arch/x86/include/asm/fixmap_64.h
index 7a518ec8263..baff6d0da99 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