From 5f13eec0118e6959419d3fce375e954b562f4721 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 15 Dec 2005 09:17:50 +0000 Subject: [PATCH] --- yaml --- r: 15175 b: refs/heads/master c: b16b88e55d808a6324d5ff02d8c686f7884870f8 h: refs/heads/master i: 15173: 436d962f2e436d65ee6db6e04abdf0b82645a204 15171: 37e2c4a075f3335adba249d301595cb5986efb3c 15167: f30b07bda28fe73e8aa62fc75357a03a4f53a2d9 v: v3 --- [refs] | 2 +- trunk/arch/i386/mm/ioremap.c | 2 +- trunk/arch/x86_64/mm/ioremap.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8daa9df6857d..7aecc9ee4798 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b8a4e33e4a320735f353a092013b314f142493d +refs/heads/master: b16b88e55d808a6324d5ff02d8c686f7884870f8 diff --git a/trunk/arch/i386/mm/ioremap.c b/trunk/arch/i386/mm/ioremap.c index 8498b5ac3955..247fde76aaed 100644 --- a/trunk/arch/i386/mm/ioremap.c +++ b/trunk/arch/i386/mm/ioremap.c @@ -245,7 +245,7 @@ void iounmap(volatile void __iomem *addr) addr < phys_to_virt(ISA_END_ADDRESS)) return; - addr = (volatile void *)(PAGE_MASK & (unsigned long __force)addr); + addr = (volatile void __iomem *)(PAGE_MASK & (unsigned long __force)addr); /* Use the vm area unlocked, assuming the caller ensures there isn't another iounmap for the same address diff --git a/trunk/arch/x86_64/mm/ioremap.c b/trunk/arch/x86_64/mm/ioremap.c index 0d260e4492f7..ae207064201e 100644 --- a/trunk/arch/x86_64/mm/ioremap.c +++ b/trunk/arch/x86_64/mm/ioremap.c @@ -263,7 +263,7 @@ void iounmap(volatile void __iomem *addr) addr < phys_to_virt(ISA_END_ADDRESS)) return; - addr = (volatile void *)(PAGE_MASK & (unsigned long __force)addr); + addr = (volatile void __iomem *)(PAGE_MASK & (unsigned long __force)addr); /* Use the vm area unlocked, assuming the caller ensures there isn't another iounmap for the same address in parallel. Reuse of the virtual address is prevented by