From: Jeremy Fitzhardinge <jeremy@goop.org>
To: Ingo Molnar <mingo@elte.hu>
Cc: Andi Kleen <andi@firstfloor.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: [PATCH] acpi: remove final __acpi_map_table mapping before setting acpi_gbl_permanent_mmap
Date: Thu, 11 Sep 2008 14:33:16 -0700 [thread overview]
Message-ID: <48C98E9C.9090709@goop.org> (raw)
In-Reply-To: <20080911125748.GA14698@elte.hu>
On x86, __acpi_map_table uses early_ioremap() to create the mapping,
replacing the previous mapping with a new one. Once enough of the
kernel is up an running it switches to using normal ioremap(). At
that point, we need to clean up the final mapping to avoid a warning
from the early_ioremap subsystem.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
---
arch/x86/kernel/acpi/boot.c | 8 +++++---
drivers/acpi/bus.c | 6 ++++++
2 files changed, 11 insertions(+), 3 deletions(-)
===================================================================
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -124,11 +124,13 @@
static char *prev_map;
static unsigned long prev_size;
+ if (prev_map) {
+ early_iounmap(prev_map, prev_size);
+ prev_map = NULL;
+ }
+
if (!phys || !size)
return NULL;
-
- if (prev_map)
- early_iounmap(prev_map, prev_size);
prev_size = size;
prev_map = early_ioremap(phys, size);
===================================================================
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -650,6 +650,12 @@
if (!acpi_strict)
acpi_gbl_enable_interpreter_slack = TRUE;
+ /*
+ * Doing a zero-sized mapping will clear out the previous
+ * __acpi_map_table() mapping, if any.
+ */
+ __acpi_map_table(0, 0);
+
acpi_gbl_permanent_mmap = 1;
status = acpi_reallocate_root_table();
next prev parent reply other threads:[~2008-09-11 21:34 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-07 22:21 [PATCH 0 of 7] x86: lay groundwork for Xen domain 0 support Jeremy Fitzhardinge
2008-09-07 22:21 ` [PATCH 1 of 7] x86: add _PAGE_IOMAP pte flag for IO mappings Jeremy Fitzhardinge
2008-09-09 13:32 ` Avi Kivity
2008-09-09 14:47 ` Jeremy Fitzhardinge
2008-09-09 14:56 ` Avi Kivity
2008-09-09 15:29 ` [Xen-devel] " Keir Fraser
2008-09-09 15:48 ` Jeremy Fitzhardinge
2008-09-09 16:05 ` Keir Fraser
2008-09-10 9:55 ` Avi Kivity
2008-09-10 16:38 ` Jeremy Fitzhardinge
2008-09-10 16:55 ` Nick Piggin
2008-09-10 17:27 ` Jeremy Fitzhardinge
2008-09-07 22:21 ` [PATCH 2 of 7] x86: remove duplicate early_ioremap declarations Jeremy Fitzhardinge
2008-09-07 22:21 ` [PATCH 3 of 7] x86: add early_memremap() Jeremy Fitzhardinge
2008-09-07 22:21 ` [PATCH 4 of 7] x86: use early_memremap() in setup.c Jeremy Fitzhardinge
2008-09-07 22:21 ` [PATCH 5 of 7] x86-64: don't check for map replacement Jeremy Fitzhardinge
2008-09-07 22:21 ` [PATCH 6 of 7] x86: use early_ioremap in __acpi_map_table Jeremy Fitzhardinge
2008-09-07 23:44 ` Andi Kleen
2008-09-08 0:03 ` Jeremy Fitzhardinge
2008-09-08 14:26 ` Ingo Molnar
2008-09-08 16:29 ` Jeremy Fitzhardinge
2008-09-08 19:41 ` Jeremy Fitzhardinge
2008-09-10 11:55 ` Ingo Molnar
2008-09-10 16:49 ` Jeremy Fitzhardinge
2008-09-11 7:33 ` Ingo Molnar
2008-09-11 18:36 ` Jeremy Fitzhardinge
2008-09-11 18:56 ` Ingo Molnar
2008-09-11 20:34 ` Yinghai Lu
2008-09-11 21:07 ` Jeremy Fitzhardinge
2008-09-12 9:49 ` Ingo Molnar
2008-09-12 17:31 ` Yinghai Lu
[not found] ` <20080911125748.GA14698@elte.hu>
2008-09-11 21:33 ` Jeremy Fitzhardinge [this message]
2008-09-07 22:21 ` [PATCH 7 of 7] x86: always explicitly map acpi memory Jeremy Fitzhardinge
2008-09-07 23:35 ` [Xen-devel] " Yinghai Lu
2008-09-08 0:02 ` Jeremy Fitzhardinge
2008-09-08 0:14 ` Yinghai Lu
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=48C98E9C.9090709@goop.org \
--to=jeremy@goop.org \
--cc=andi@firstfloor.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
/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;
as well as URLs for NNTP newsgroup(s).