x86: Fix Moorestown VRTC fixmap placement
authorArjan van de Ven <arjan@linux.intel.com>
Tue, 11 Jan 2011 10:55:56 +0000 (10:55 +0000)
committerIngo Molnar <mingo@elte.hu>
Tue, 11 Jan 2011 11:46:16 +0000 (12:46 +0100)
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>
LKML-Reference: <20110111105544.24448.27607.stgit@bob.linux.org.uk>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/include/asm/fixmap.h

index 0141b234406fb01f8418320ea49c997fdbd14cbb..4729b2b631170cb621ab5549c4fc7f474a27d5cc 100644 (file)
@@ -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.