x86/early_printk: Set __iomem address space for IO
PATCH v3 1/1 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>*vaddrarch/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>*vaddrarch/x86/kernel/early_printk.c:205:32: got unsigned int [usertype] *<noident>
---
v3:
- u32 * -> u32 __iomem *
arch/x86/kernel/early_printk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/early_printk.c +2 -2
@@ -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); }
Signature · 1 line
2.5.3
tip-bot for Andy Shevchenko
merge botx86/early_printk: Set __iomem address space for IO
Commit-ID: 3435dd08092934ee9672fc28a3ee4c2017741bd6 Gitweb: http://git.kernel.org/tip/3435dd08092934ee9672fc28a3ee4c2017741bd6 Author: Andy Shevchenko <[email protected]> AuthorDate: Mon, 12 Oct 2015 13:47:17 +0300 Committer: Thomas Gleixner <[email protected]> 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] <asn:2>*vaddrarch/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>*vaddrarch/x86/kernel/early_printk.c:205:32: got unsigned int [usertype] *<noident>
Annotate it proper.
--- arch/x86/kernel/early_printk.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/early_printk.c +2 -2
@@ -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); }