Skip to content

Commit fa36e95

Browse files
fenrus75Ingo Molnar
authored andcommitted
x86: Fix Moorestown VRTC fixmap placement
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 <[email protected]> Signed-off-by: Alan Cox <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
1 parent 718c45b commit fa36e95

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/x86/include/asm/fixmap.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,11 @@ enum fixed_addresses {
116116
#endif
117117
FIX_TEXT_POKE1, /* reserve 2 pages for text_poke() */
118118
FIX_TEXT_POKE0, /* first page is last, because allocation is backward */
119-
__end_of_permanent_fixed_addresses,
120-
121119
#ifdef CONFIG_X86_MRST
122120
FIX_LNW_VRTC,
123121
#endif
122+
__end_of_permanent_fixed_addresses,
123+
124124
/*
125125
* 256 temporary boot-time mappings, used by early_ioremap(),
126126
* before ioremap() is functional.

0 commit comments

Comments
 (0)