Subject: patch devres-support-addresses-greater-than-an-unsigned-long-via-dev_ioremap.patch added to gregkh-2.6 tree

From: <[email-masked]>
Date: Wed, 30 Apr 2008 11:42:53 -0700

This is a note to let you know that I've just added the patch titled

     Subject: devres: support addresses greater than an unsigned long via dev_ioremap

to my gregkh-2.6 tree.  Its filename is

     devres-support-addresses-greater-than-an-unsigned-long-via-dev_ioremap.patch

This tree can be found at 
    http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/

>>From [email-masked]  Wed Apr 30 11:27:51 2008
From: Kumar Gala <[email-masked]>
Date: Tue, 29 Apr 2008 10:25:48 -0500 (CDT)
Subject: devres: support addresses greater than an unsigned long via dev_ioremap
To: Greg KH <[email-masked]>
Cc: Tejun Heo <[email-masked]>, Jeff Garzik <[email-masked]>, Andrew Morton <[email-masked]>, "[email-masked] list" <[email-masked]>, lkml Mailing List <[email-masked]>, Jesse Barnes <[email-masked]>
Message-ID: <[email-masked]>

Use a resource_size_t instead of unsigned long since some arch's are
capable of having ioremap deal with addresses greater than the size of a
unsigned long.

Signed-off-by: Kumar Gala <[email-masked]>
Cc: Tejun Heo <[email-masked]>
Cc: Jeff Garzik <[email-masked]>
Signed-off-by: Greg Kroah-Hartman <[email-masked]>

---
 include/linux/io.h |    4 ++--
 lib/devres.c       |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

--- a/include/linux/io.h
+++ b/include/linux/io.h
@@ -58,9 +58,9 @@ static inline void devm_ioport_unmap(str
 }
 #endif
 
-void __iomem * devm_ioremap(struct device *dev, unsigned long offset,
+void __iomem * devm_ioremap(struct device *dev, resource_size_t offset,
 			    unsigned long size);
-void __iomem * devm_ioremap_nocache(struct device *dev, unsigned long offset,
+void __iomem * devm_ioremap_nocache(struct device *dev, resource_size_t offset,
 				    unsigned long size);
 void devm_iounmap(struct device *dev, void __iomem *addr);
 int check_signature(const volatile void __iomem *io_addr,
--- a/lib/devres.c
+++ b/lib/devres.c
@@ -20,7 +20,7 @@ static int devm_ioremap_match(struct dev
  *
  * Managed ioremap().  Map is automatically unmapped on driver detach.
  */
-void __iomem *devm_ioremap(struct device *dev, unsigned long offset,
+void __iomem *devm_ioremap(struct device *dev, resource_size_t offset,
 			   unsigned long size)
 {
 	void __iomem **ptr, *addr;
@@ -49,7 +49,7 @@ EXPORT_SYMBOL(devm_ioremap);
  * Managed ioremap_nocache().  Map is automatically unmapped on driver
  * detach.
  */
-void __iomem *devm_ioremap_nocache(struct device *dev, unsigned long offset,
+void __iomem *devm_ioremap_nocache(struct device *dev, resource_size_t offset,
 				   unsigned long size)
 {
 	void __iomem **ptr, *addr;

Patches currently in gregkh-2.6 which might be from [email-masked] are

driver-core/devres-support-addresses-greater-than-an-unsigned-long-via-dev_ioremap.patch