# HG changeset patch # User Daniel Stodden # Date 1265397134 28800 # Node ID 5a033c651dc03e82c31ec28f304ab799092a533e # Parent 307e7eb9aeec6703359b27546c1d93b59052cf24 Fix x86_32 build after CONFIG_X86_VSYSCALL (c3a1cb06) Signed-off-by: Daniel Stodden diff -r 307e7eb9aeec -r 5a033c651dc0 arch/x86/include/asm/fixmap.h --- a/arch/x86/include/asm/fixmap.h Fri Feb 05 11:12:13 2010 -0800 +++ b/arch/x86/include/asm/fixmap.h Fri Feb 05 11:12:14 2010 -0800 @@ -189,7 +189,9 @@ #ifdef CONFIG_X86_32 case FIX_HOLE ... FIX_VDSO: #else +#ifdef CONFIG_X86_VSYSCALL case VSYSCALL_LAST_PAGE ... VSYSCALL_HPET: +#endif #ifdef CONFIG_PARAVIRT_CLOCK_VSYSCALL case FIX_PVCLOCK_TIME_INFO: #endif