aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo F. Padovan <gustavo@las.ic.unicamp.br>2009-02-15 19:48:56 -0500
committerH. Peter Anvin <hpa@zytor.com>2009-02-27 23:57:47 -0500
commit5f403fa9de5b3bb1309ec5f72b1e52e5b51321d4 (patch)
tree29dfa34b6b212c88715a8ce5fa7bb11d6777e367
parent2ae38daf25204b7c3725e053052f77469eff62cf (diff)
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>
-rw-r--r--arch/x86/include/asm/fixmap_64.h4
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 7a518ec8263..baff6d0da99 100644
--- a/arch/x86/include/asm/fixmap_64.h
+++ b/arch/x86/include/asm/fixmap_64.h
@@ -16,7 +16,9 @@
16#include <asm/apicdef.h> 16#include <asm/apicdef.h>
17#include <asm/page.h> 17#include <asm/page.h>
18#include <asm/vsyscall.h> 18#include <asm/vsyscall.h>
19#ifdef CONFIG_EFI
19#include <asm/efi.h> 20#include <asm/efi.h>
21#endif
20 22
21/* 23/*
22 * Here we define all the compile-time 'special' virtual 24 * Here we define all the compile-time 'special' virtual
@@ -47,9 +49,11 @@ enum fixed_addresses {
47 FIX_IO_APIC_BASE_0, 49 FIX_IO_APIC_BASE_0,
48 FIX_IO_APIC_BASE_END = FIX_IO_APIC_BASE_0 + MAX_IO_APICS - 1, 50 FIX_IO_APIC_BASE_END = FIX_IO_APIC_BASE_0 + MAX_IO_APICS - 1,
49#endif 51#endif
52#ifdef CONFIG_EFI
50 FIX_EFI_IO_MAP_LAST_PAGE, 53 FIX_EFI_IO_MAP_LAST_PAGE,
51 FIX_EFI_IO_MAP_FIRST_PAGE = FIX_EFI_IO_MAP_LAST_PAGE 54 FIX_EFI_IO_MAP_FIRST_PAGE = FIX_EFI_IO_MAP_LAST_PAGE
52 + MAX_EFI_IO_PAGES - 1, 55 + MAX_EFI_IO_PAGES - 1,
56#endif
53#ifdef CONFIG_PARAVIRT 57#ifdef CONFIG_PARAVIRT
54 FIX_PARAVIRT_BOOTMAP, 58 FIX_PARAVIRT_BOOTMAP,
55#endif 59#endif