aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2015-10-12 06:47:17 -0400
committerThomas Gleixner <tglx@linutronix.de>2015-10-13 15:45:56 -0400
commit3435dd08092934ee9672fc28a3ee4c2017741bd6 (patch)
tree3f9792e6a2c1d2fda178e43ed492d547e5568adf
parentdae0f305d61b07933a129dfe975342f3177277d5 (diff)
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] <asn:2>*vaddr arch/x86/kernel/early_printk.c:198:32: got unsigned int [usertype] *<noident> 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] <asn:2>*vaddr arch/x86/kernel/early_printk.c:205:32: got unsigned int [usertype] *<noident> Annotate it proper. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Link: http://lkml.kernel.org/r/1444646837-42615-1-git-send-email-andriy.shevchenko@linux.intel.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--arch/x86/kernel/early_printk.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
index 076a4a739aa6..21bf92490a7b 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)
195#ifdef CONFIG_PCI 195#ifdef CONFIG_PCI
196static void mem32_serial_out(unsigned long addr, int offset, int value) 196static void mem32_serial_out(unsigned long addr, int offset, int value)
197{ 197{
198 u32 *vaddr = (u32 *)addr; 198 u32 __iomem *vaddr = (u32 __iomem *)addr;
199 /* shift implied by pointer type */ 199 /* shift implied by pointer type */
200 writel(value, vaddr + offset); 200 writel(value, vaddr + offset);
201} 201}
202 202
203static unsigned int mem32_serial_in(unsigned long addr, int offset) 203static unsigned int mem32_serial_in(unsigned long addr, int offset)
204{ 204{
205 u32 *vaddr = (u32 *)addr; 205 u32 __iomem *vaddr = (u32 __iomem *)addr;
206 /* shift implied by pointer type */ 206 /* shift implied by pointer type */
207 return readl(vaddr + offset); 207 return readl(vaddr + offset);
208} 208}