Commit-ID: cbdce7b251de89deef79ec9e37b6cfa7d5595894 Gitweb: http://git.kernel.org/tip/cbdce7b251de89deef79ec9e37b6cfa7d5595894 Author: Jan Beulich <JBeulich@xxxxxxxx> AuthorDate: Wed, 29 May 2013 13:22:23 +0100 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitDate: Fri, 31 May 2013 13:08:18 +0200 ix86: Don't waste fixmap entries The vsyscall related pvclock entries can only ever be used on x86-64, and hence they shouldn't even get allocated for 32-bit kernels (the more that it is there where address space is relatively precious). Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx> Cc: Marcelo Tosatti <mtosatti@xxxxxxxxxx> Link: http://lkml.kernel.org/r/51A60F1F02000078000D997C@xxxxxxxxxxxxxxxxxxxx Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> --- arch/x86/include/asm/fixmap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/include/asm/fixmap.h b/arch/x86/include/asm/fixmap.h index 0dc7d9e..e846225 100644 --- a/arch/x86/include/asm/fixmap.h +++ b/arch/x86/include/asm/fixmap.h @@ -81,11 +81,11 @@ enum fixed_addresses { + ((VSYSCALL_END-VSYSCALL_START) >> PAGE_SHIFT) - 1, VVAR_PAGE, VSYSCALL_HPET, -#endif #ifdef CONFIG_PARAVIRT_CLOCK PVCLOCK_FIXMAP_BEGIN, PVCLOCK_FIXMAP_END = PVCLOCK_FIXMAP_BEGIN+PVCLOCK_VSYSCALL_NR_PAGES-1, #endif +#endif FIX_DBGP_BASE, FIX_EARLYCON_MEM_BASE, #ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT -- 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