Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5559b7bc authored by Cristian Stoica's avatar Cristian Stoica Committed by Greg Kroah-Hartman
Browse files

devres: support sizes greater than an unsigned long 



As in 4f452e8a, 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: default avatarCristian Stoica <cristian.stoica@freescale.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5ebdc364

include/linux/io.h

+2 −2
Original line number Diff line number Diff line
@@ -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);

lib/devres.c

+2 −2
Original line number Diff line number Diff line
@@ -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;