From 539c5f304a2f02f0cf37a05a0d5577ccc255b273 Mon Sep 17 00:00:00 2001 From: "Gustavo F. Padovan" Date: Sun, 15 Feb 2009 21:48:55 -0300 Subject: [PATCH] --- yaml --- r: 137020 b: refs/heads/master c: 2ae38daf25204b7c3725e053052f77469eff62cf h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/fixmap_64.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 331677bdac35..f1f8a3a631ab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd862dde18c3e360f510780e1d1bf615866b11c2 +refs/heads/master: 2ae38daf25204b7c3725e053052f77469eff62cf diff --git a/trunk/arch/x86/include/asm/fixmap_64.h b/trunk/arch/x86/include/asm/fixmap_64.h index b6c06dd55f1c..7a518ec82635 100644 --- a/trunk/arch/x86/include/asm/fixmap_64.h +++ b/trunk/arch/x86/include/asm/fixmap_64.h @@ -40,9 +40,13 @@ enum fixed_addresses { VSYSCALL_HPET, FIX_DBGP_BASE, FIX_EARLYCON_MEM_BASE, +#ifdef CONFIG_X86_LOCAL_APIC FIX_APIC_BASE, /* local (CPU) APIC) -- required for SMP or not */ +#endif +#ifdef CONFIG_X86_IO_APIC FIX_IO_APIC_BASE_0, FIX_IO_APIC_BASE_END = FIX_IO_APIC_BASE_0 + MAX_IO_APICS - 1, +#endif FIX_EFI_IO_MAP_LAST_PAGE, FIX_EFI_IO_MAP_FIRST_PAGE = FIX_EFI_IO_MAP_LAST_PAGE + MAX_EFI_IO_PAGES - 1,