From: Alan Cox <alan@lxorguk.ukuu.org.uk>
To: x86@kernel.org, akpm@linux-foundation.org, linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] Fix Moorestown VRTC fixmap placement
Date: Tue, 11 Jan 2011 10:55:56 +0000 [thread overview]
Message-ID: <20110111105544.24448.27607.stgit@bob.linux.org.uk> (raw)
In-Reply-To: <20110111105439.24448.69863.stgit@bob.linux.org.uk>
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.
next prev parent reply other threads:[~2011-01-11 11:21 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-11 10:55 [PATCH 1/2] gpio: implement x86 gpio_to_irq convert function Alan Cox
2011-01-11 10:55 ` Alan Cox [this message]
2011-01-11 12:28 ` [tip:x86/urgent] x86: Fix Moorestown VRTC fixmap placement tip-bot for Arjan van de Ven
2011-01-11 12:28 ` [tip:x86/urgent] x86/gpio: Implement x86 gpio_to_irq convert function tip-bot for Alek Du
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110111105544.24448.27607.stgit@bob.linux.org.uk \
--to=alan@lxorguk.ukuu.org.uk \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®