aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/io.h
diff options
context:
space:
mode:
authorCristian Stoica <cristian.stoica@freescale.com>2014-10-07 18:25:43 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-07 10:09:07 -0800
commit5559b7bc42f1ff85759246e40ef73abf3171d8d9 (patch)
treefdb8002a804ce063e2c7374064a57c20a30754a5 /include/linux/io.h
parentmei: fix hbm MEI_HBM_STARTED ambiguity (diff)
downloadlinux-dev-5559b7bc42f1ff85759246e40ef73abf3171d8d9.tar.xz
linux-dev-5559b7bc42f1ff85759246e40ef73abf3171d8d9.zip
devres: support sizes greater than an unsigned long
As in 4f452e8aa492c0b8028ca9b4bdb4d018ba28c6c7, use resource_size_t to accomodate sizes greater than the size of an unsigned long int on platforms that have more than 32 bit physical addresses. Signed-off-by: Cristian Stoica <cristian.stoica@freescale.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/io.h')
-rw-r--r--include/linux/io.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/io.h b/include/linux/io.h
index d5fc9b8d8b03..fa02e55e5a2e 100644
--- a/include/linux/io.h
+++ b/include/linux/io.h
@@ -61,9 +61,9 @@ static inline void devm_ioport_unmap(struct device *dev, void __iomem *addr)
#define IOMEM_ERR_PTR(err) (__force void __iomem *)ERR_PTR(err)
void __iomem *devm_ioremap(struct device *dev, resource_size_t offset,
- unsigned long size);
+ resource_size_t size);
void __iomem *devm_ioremap_nocache(struct device *dev, resource_size_t offset,
- unsigned long size);
+ resource_size_t size);
void devm_iounmap(struct device *dev, void __iomem *addr);
int check_signature(const volatile void __iomem *io_addr,
const unsigned char *signature, int length);