linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeremy Fitzhardinge <jeremy@goop.org>
To: Ingo Molnar <mingo@elte.hu>
Cc: linux-kernel@vger.kernel.org, "H. Peter Anvin" <hpa@zytor.com>,
	Xen Devel <xen-devel@lists.xensource.com>,
	Andi Kleen <andi@firstfloor.org>
Subject: [PATCH 4 of 7] x86: use early_memremap() in setup.c
Date: Sun, 07 Sep 2008 15:21:16 -0700	[thread overview]
Message-ID: <15fd328b5bfcad8b58eb.1220826076@localhost> (raw)
In-Reply-To: <patchbomb.1220826072@localhost>

The remappings in setup.c are all just ordinary memory, so use
early_memremap() rather than early_ioremap().

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
---
 arch/x86/kernel/setup.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -302,7 +302,7 @@
 		if (clen > MAX_MAP_CHUNK-slop)
 			clen = MAX_MAP_CHUNK-slop;
 		mapaddr = ramdisk_image & PAGE_MASK;
-		p = early_ioremap(mapaddr, clen+slop);
+		p = early_memremap(mapaddr, clen+slop);
 		memcpy(q, p+slop, clen);
 		early_iounmap(p, clen+slop);
 		q += clen;
@@ -379,7 +379,7 @@
 		return;
 	pa_data = boot_params.hdr.setup_data;
 	while (pa_data) {
-		data = early_ioremap(pa_data, PAGE_SIZE);
+		data = early_memremap(pa_data, PAGE_SIZE);
 		switch (data->type) {
 		case SETUP_E820_EXT:
 			parse_e820_ext(data, pa_data);
@@ -402,7 +402,7 @@
 		return;
 	pa_data = boot_params.hdr.setup_data;
 	while (pa_data) {
-		data = early_ioremap(pa_data, sizeof(*data));
+		data = early_memremap(pa_data, sizeof(*data));
 		e820_update_range(pa_data, sizeof(*data)+data->len,
 			 E820_RAM, E820_RESERVED_KERN);
 		found = 1;
@@ -428,7 +428,7 @@
 		return;
 	pa_data = boot_params.hdr.setup_data;
 	while (pa_data) {
-		data = early_ioremap(pa_data, sizeof(*data));
+		data = early_memremap(pa_data, sizeof(*data));
 		sprintf(buf, "setup data %x", data->type);
 		reserve_early(pa_data, pa_data+sizeof(*data)+data->len, buf);
 		pa_data = data->next;



  parent reply	other threads:[~2008-09-07 22:25 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 ` Jeremy Fitzhardinge [this message]
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               ` [PATCH] acpi: remove final __acpi_map_table mapping before setting acpi_gbl_permanent_mmap Jeremy Fitzhardinge
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=15fd328b5bfcad8b58eb.1220826076@localhost \
    --to=jeremy@goop.org \
    --cc=andi@firstfloor.org \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=xen-devel@lists.xensource.com \
    /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).