diff options
| author | Arjan van de Ven <arjan@linux.intel.com> | 2011-01-11 10:55:56 +0000 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-01-11 12:46:16 +0100 |
| commit | fa36e956c5027d9a985d555d104d293c0a98d2c3 (patch) | |
| tree | 0e49cce97a551b12c740d4173cad6d635a706cc4 /arch | |
| parent | 718c45bd1aa80c4e23a0ee204c973e3014e94708 (diff) | |
| download | blackbird-op-linux-fa36e956c5027d9a985d555d104d293c0a98d2c3.tar.gz blackbird-op-linux-fa36e956c5027d9a985d555d104d293c0a98d2c3.zip | |
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 <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>
Diffstat (limited to 'arch')
| -rw-r--r-- | 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 0141b234406f..4729b2b63117 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. |
