Messages in this thread Patch in this message | | | From | Alan Cox <> | Subject | [PATCH 2/2] Fix Moorestown VRTC fixmap placement | Date | Tue, 11 Jan 2011 10:55:56 +0000 |
| |
From: Arjan van de Ven <arjan@linux.intel.com>
The x86 fixmaps need to be all together... unfortunately the VRTC one was misplaced.
This patch makes sure the MRST VRTC fixmap is put prior to the __end_of_permanent_fixed_addresses marker.
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com> Signed-off-by: Alan Cox <alan@linux.intel.com> ---
arch/x86/include/asm/fixmap.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/fixmap.h b/arch/x86/include/asm/fixmap.h index 0141b23..4729b2b 100644 --- a/arch/x86/include/asm/fixmap.h +++ b/arch/x86/include/asm/fixmap.h @@ -116,11 +116,11 @@ enum fixed_addresses { #endif FIX_TEXT_POKE1, /* reserve 2 pages for text_poke() */ FIX_TEXT_POKE0, /* first page is last, because allocation is backward */ - __end_of_permanent_fixed_addresses, - #ifdef CONFIG_X86_MRST FIX_LNW_VRTC, #endif + __end_of_permanent_fixed_addresses, + /* * 256 temporary boot-time mappings, used by early_ioremap(), * before ioremap() is functional.
| |