summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorCristian Stoica <cristian.stoica@freescale.com>2014-10-07 17:25:43 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-07 19:09:07 +0100
commit5559b7bc42f1ff85759246e40ef73abf3171d8d9 (patch)
treefdb8002a804ce063e2c7374064a57c20a30754a5 /lib
parentmei: fix hbm MEI_HBM_STARTED ambiguity (diff)
downloadlinux-5559b7bc42f1ff85759246e40ef73abf3171d8d9.tar.xz
linux-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 'lib')
-rw-r--r--lib/devres.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/devres.c b/lib/devres.c
index f4a195a6efe4..0f1dd2e9d2c1 100644
--- a/lib/devres.c
+++ b/lib/devres.c
@@ -23,7 +23,7 @@ static int devm_ioremap_match(struct device *dev, void *res, void *match_data)
* Managed ioremap(). Map is automatically unmapped on driver detach.
*/
void __iomem *devm_ioremap(struct device *dev, resource_size_t offset,
- unsigned long size)
+ resource_size_t size)
{
void __iomem **ptr, *addr;
@@ -52,7 +52,7 @@ EXPORT_SYMBOL(devm_ioremap);
* detach.
*/
void __iomem *devm_ioremap_nocache(struct device *dev, resource_size_t offset,
- unsigned long size)
+ resource_size_t size)
{
void __iomem **ptr, *addr;