From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752744AbbJMTsy (ORCPT ); Tue, 13 Oct 2015 15:48:54 -0400 Received: from terminus.zytor.com ([198.137.202.10]:44775 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751834AbbJMTsw (ORCPT ); Tue, 13 Oct 2015 15:48:52 -0400 Date: Tue, 13 Oct 2015 12:48:36 -0700 From: tip-bot for Andy Shevchenko Message-ID: Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, tglx@linutronix.de, andriy.shevchenko@linux.intel.com, mingo@kernel.org Reply-To: tglx@linutronix.de, andriy.shevchenko@linux.intel.com, mingo@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com In-Reply-To: <1444646837-42615-1-git-send-email-andriy.shevchenko@linux.intel.com> References: <1444646837-42615-1-git-send-email-andriy.shevchenko@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/cleanups] x86/early_printk: Set __iomem address space for IO Git-Commit-ID: 3435dd08092934ee9672fc28a3ee4c2017741bd6 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 Commit-ID: 3435dd08092934ee9672fc28a3ee4c2017741bd6 Gitweb: http://git.kernel.org/tip/3435dd08092934ee9672fc28a3ee4c2017741bd6 Author: Andy Shevchenko AuthorDate: Mon, 12 Oct 2015 13:47:17 +0300 Committer: Thomas Gleixner CommitDate: Tue, 13 Oct 2015 21:45:56 +0200 x86/early_printk: Set __iomem address space for IO There are following warnings on unpatched code: arch/x86/kernel/early_printk.c:198:32: warning: incorrect type in initializer (different address spaces) arch/x86/kernel/early_printk.c:198:32: expected void [noderef] *vaddr arch/x86/kernel/early_printk.c:198:32: got unsigned int [usertype] * arch/x86/kernel/early_printk.c:205:32: warning: incorrect type in initializer (different address spaces) arch/x86/kernel/early_printk.c:205:32: expected void [noderef] *vaddr arch/x86/kernel/early_printk.c:205:32: got unsigned int [usertype] * Annotate it proper. Signed-off-by: Andy Shevchenko Link: http://lkml.kernel.org/r/1444646837-42615-1-git-send-email-andriy.shevchenko@linux.intel.com Signed-off-by: Thomas Gleixner --- arch/x86/kernel/early_printk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c index 076a4a7..21bf924 100644 --- a/arch/x86/kernel/early_printk.c +++ b/arch/x86/kernel/early_printk.c @@ -195,14 +195,14 @@ static __init void early_serial_init(char *s) #ifdef CONFIG_PCI static void mem32_serial_out(unsigned long addr, int offset, int value) { - u32 *vaddr = (u32 *)addr; + u32 __iomem *vaddr = (u32 __iomem *)addr; /* shift implied by pointer type */ writel(value, vaddr + offset); } static unsigned int mem32_serial_in(unsigned long addr, int offset) { - u32 *vaddr = (u32 *)addr; + u32 __iomem *vaddr = (u32 __iomem *)addr; /* shift implied by pointer type */ return readl(vaddr + offset); }