Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753356AbbBXQqU (ORCPT ); Tue, 24 Feb 2015 11:46:20 -0500 Received: from terminus.zytor.com ([198.137.202.10]:59829 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753260AbbBXQqR (ORCPT ); Tue, 24 Feb 2015 11:46:17 -0500 Date: Tue, 24 Feb 2015 08:46:01 -0800 From: tip-bot for Juergen Gross Message-ID: Cc: hpa@zytor.com, mingo@kernel.org, jgross@suse.com, linux-kernel@vger.kernel.org, tglx@linutronix.de Reply-To: linux-kernel@vger.kernel.org, jgross@suse.com, mingo@kernel.org, hpa@zytor.com, tglx@linutronix.de In-Reply-To: <1424769211-11378-5-git-send-email-jgross@suse.com> References: <1424769211-11378-5-git-send-email-jgross@suse.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] x86/mm, efi: Use early_ioremap() in arch/x86/ platform/efi/efi-bgrt.c Git-Commit-ID: 954e12f7a800ce38b4722ca1d7a6d0293d377b55 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1762 Lines: 47 Commit-ID: 954e12f7a800ce38b4722ca1d7a6d0293d377b55 Gitweb: http://git.kernel.org/tip/954e12f7a800ce38b4722ca1d7a6d0293d377b55 Author: Juergen Gross AuthorDate: Tue, 24 Feb 2015 10:13:31 +0100 Committer: Ingo Molnar 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 Cc: matt.fleming@intel.com Link: http://lkml.kernel.org/r/1424769211-11378-5-git-send-email-jgross@suse.com Signed-off-by: Ingo Molnar --- 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/