From 8f2cdeeb9f80ce1da15e63813fcafd8c53e7aa68 Mon Sep 17 00:00:00 2001 From: "Gustavo F. Padovan" Date: Sun, 15 Feb 2009 21:48:53 -0300 Subject: [PATCH] --- yaml --- r: 137018 b: refs/heads/master c: ab93e3c45dbac66c2e8e24fd560c052a3907903e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/fixmap_64.h | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9973e1e52cf2..094d76938207 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d09375a9ec80d8bae06196bb247460e0829d884c +refs/heads/master: ab93e3c45dbac66c2e8e24fd560c052a3907903e diff --git a/trunk/arch/x86/include/asm/fixmap_64.h b/trunk/arch/x86/include/asm/fixmap_64.h index 298d9ba3faeb..d905de086753 100644 --- a/trunk/arch/x86/include/asm/fixmap_64.h +++ b/trunk/arch/x86/include/asm/fixmap_64.h @@ -69,8 +69,11 @@ enum fixed_addresses { }; #define FIXADDR_TOP (VSYSCALL_END-PAGE_SIZE) -#define FIXADDR_SIZE (__end_of_fixed_addresses << PAGE_SHIFT) -#define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE) + +#define FIXADDR_SIZE (__end_of_permanent_fixed_addresses << PAGE_SHIFT) +#define FIXADDR_BOOT_SIZE (__end_of_fixed_addresses << PAGE_SHIFT) +#define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE) +#define FIXADDR_BOOT_START (FIXADDR_TOP - FIXADDR_BOOT_SIZE) /* Only covers 32bit vsyscalls currently. Need another set for 64bit. */ #define FIXADDR_USER_START ((unsigned long)VSYSCALL32_VSYSCALL)