x86, fixmap: add CONFIG_EFI
authorGustavo F. Padovan <gustavo@las.ic.unicamp.br>
Mon, 16 Feb 2009 00:48:56 +0000 (21:48 -0300)
committerH. Peter Anvin <hpa@zytor.com>
Sat, 28 Feb 2009 04:57:47 +0000 (20:57 -0800)
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>
arch/x86/include/asm/fixmap_64.h

index 7a518ec82635fe2cabadb9a2710663f15ec584ea..baff6d0da995b3ecf47c37980a8dcce637dbd4f1 100644 (file)
@@ -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