[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-954e12f7a800ce38b4722ca1d7a6d0293d377b55@git.kernel.org>
Date: Tue, 24 Feb 2015 08:46:01 -0800
From: tip-bot for Juergen Gross <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: hpa@...or.com, mingo@...nel.org, jgross@...e.com,
linux-kernel@...r.kernel.org, tglx@...utronix.de
Subject: [tip:x86/mm] x86/mm, efi: Use early_ioremap() in arch/x86/
platform/efi/efi-bgrt.c
Commit-ID: 954e12f7a800ce38b4722ca1d7a6d0293d377b55
Gitweb: http://git.kernel.org/tip/954e12f7a800ce38b4722ca1d7a6d0293d377b55
Author: Juergen Gross <jgross@...e.com>
AuthorDate: Tue, 24 Feb 2015 10:13:31 +0100
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Tue, 24 Feb 2015 15:58:07 +0100
x86/mm, efi: Use early_ioremap() in arch/x86/platform/efi/efi-bgrt.c
Use early_ioremap() to map an I/O-area instead of
early_memremap().
Signed-off-by: Juergen Gross <jgross@...e.com>
Cc: matt.fleming@...el.com
Link: http://lkml.kernel.org/r/1424769211-11378-5-git-send-email-jgross@suse.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
arch/x86/platform/efi/efi-bgrt.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/platform/efi/efi-bgrt.c b/arch/x86/platform/efi/efi-bgrt.c
index d143d21..d7f997f 100644
--- a/arch/x86/platform/efi/efi-bgrt.c
+++ b/arch/x86/platform/efi/efi-bgrt.c
@@ -67,7 +67,7 @@ void __init efi_bgrt_init(void)
image = efi_lookup_mapped_addr(bgrt_tab->image_address);
if (!image) {
- image = early_memremap(bgrt_tab->image_address,
+ image = early_ioremap(bgrt_tab->image_address,
sizeof(bmp_header));
ioremapped = true;
if (!image) {
@@ -89,7 +89,7 @@ void __init efi_bgrt_init(void)
}
if (ioremapped) {
- image = early_memremap(bgrt_tab->image_address,
+ image = early_ioremap(bgrt_tab->image_address,
bmp_header.size);
if (!image) {
pr_err("Ignoring BGRT: failed to map image memory\n");
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists