From d1f6efdb5ca123a0a8c1809810b48db3eee376e6 Mon Sep 17 00:00:00 2001
From: Greg Pearson <greg.pearson@hp.com>
Date: Mon, 30 Jul 2012 14:39:05 -0700
Subject: [PATCH] --- yaml --- r: 319871 b: refs/heads/master c:
 6c4088ac3a4d82779903433bcd5f048c58fb1aca h: refs/heads/master i:   319869:
 82110033857fbf09976b88aa789c02bc034f9261   319867:
 6d155578e0bb7139b9b5ed0b0057276b592b30a4   319863:
 fa9c61c4e19975d1e7cd4745e7dc9d4bae710ee7   319855:
 9fc9b4784675428a35e7250de15993ee581fe92f   319839:
 3548b4639d8f80c15da7c23ff96717d29687f6db   319807:
 27655db887eedf7351e5166a93fbadf41ac50e7a   319743:
 e5137e7aa1b0bd5d07c9712ad8cfe02f9e1af11b v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/firmware/pcdp.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f6d56477c45e..12382eab2a4b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc32f63453f56d07a1073a697dcd843dd3098c09
+refs/heads/master: 6c4088ac3a4d82779903433bcd5f048c58fb1aca
diff --git a/trunk/drivers/firmware/pcdp.c b/trunk/drivers/firmware/pcdp.c
index 51e0e2d8fac6..a330492e06f9 100644
--- a/trunk/drivers/firmware/pcdp.c
+++ b/trunk/drivers/firmware/pcdp.c
@@ -95,7 +95,7 @@ efi_setup_pcdp_console(char *cmdline)
 	if (efi.hcdp == EFI_INVALID_TABLE_ADDR)
 		return -ENODEV;
 
-	pcdp = ioremap(efi.hcdp, 4096);
+	pcdp = early_ioremap(efi.hcdp, 4096);
 	printk(KERN_INFO "PCDP: v%d at 0x%lx\n", pcdp->rev, efi.hcdp);
 
 	if (strstr(cmdline, "console=hcdp")) {
@@ -131,6 +131,6 @@ efi_setup_pcdp_console(char *cmdline)
 	}
 
 out:
-	iounmap(pcdp);
+	early_iounmap(pcdp, 4096);
 	return rc;
 }