From: KOSAKI Motohiro Date: Tue, 6 Jan 2009 22:39:43 +0000 (-0800) Subject: mm: make maddr __iomem X-Git-Tag: v2.6.29-rc1~440 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2bc7273b0e3a509fb598abfc5b9fe50158b830d2;p=linux-2.6-omap-h63xx.git mm: make maddr __iomem sparse output following warnings. mm/memory.c:2936:8: warning: incorrect type in assignment (different address spaces) mm/memory.c:2936:8: expected void *maddr mm/memory.c:2936:8: got void [noderef] cleanup here. Signed-off-by: KOSAKI Motohiro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/mm/memory.c b/mm/memory.c index 1a83fe5339a..89339c61f8e 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -2966,7 +2966,7 @@ int generic_access_phys(struct vm_area_struct *vma, unsigned long addr, { resource_size_t phys_addr; unsigned long prot = 0; - void *maddr; + void __iomem *maddr; int offset = addr & (PAGE_SIZE-1); if (follow_phys(vma, addr, write, &prot, &phys_addr))