summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/iomap.h
diff options
context:
space:
mode:
authorFrancisco Jerez <currojerez@riseup.net>2010-09-04 22:56:43 +0200
committerIngo Molnar <mingo@elte.hu>2010-09-05 14:26:14 +0200
commitcc1a8e523333bc3d990102140f4d12908fa83caf (patch)
treef8f2f4059968288ed6f5d452e7151f275a37a3d8 /arch/x86/include/asm/iomap.h
parentx86, mm: Fix CONFIG_VMSPLIT_1G and 2G_OPT trampoline (diff)
downloadlinux-cc1a8e523333bc3d990102140f4d12908fa83caf.tar.xz
linux-cc1a8e523333bc3d990102140f4d12908fa83caf.zip
x86: Fix the address space annotations of iomap_atomic_prot_pfn()
This patch fixes the sparse warnings when the return pointer of iomap_atomic_prot_pfn() is used as an argument of iowrite32() and friends. Signed-off-by: Francisco Jerez <currojerez@riseup.net> LKML-Reference: <1283633804-11749-1-git-send-email-currojerez@riseup.net> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/iomap.h')
-rw-r--r--arch/x86/include/asm/iomap.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/iomap.h b/arch/x86/include/asm/iomap.h
index f35eb45d6576..c4191b3b7056 100644
--- a/arch/x86/include/asm/iomap.h
+++ b/arch/x86/include/asm/iomap.h
@@ -26,11 +26,11 @@
#include <asm/pgtable.h>
#include <asm/tlbflush.h>
-void *
+void __iomem *
iomap_atomic_prot_pfn(unsigned long pfn, enum km_type type, pgprot_t prot);
void
-iounmap_atomic(void *kvaddr, enum km_type type);
+iounmap_atomic(void __iomem *kvaddr, enum km_type type);
int
iomap_create_wc(resource_size_t base, unsigned long size, pgprot_t *prot);