[git pull] drm for 2.6.35-rc1 (revised)

[Randy Dunlap]

On Fri, 21 May 2010 11:56:39 -0700 (PDT) Linus Torvalds wrote:

> 
> 
> Grrr. Not well tested. On x86, I get several warnings like this:
> 
> 	drivers/video/fbmem.c: In function ‘fb_do_apertures_overlap’:
> 	drivers/video/fbmem.c:1494: warning: format ‘%llx’ expects type ‘long long unsigned int’, but argument 2 has type ‘resource_size_t’
> 
> Please fix. And please test the thing. 

I sent a patch for this a few days ago.  Below.

---
From: Randy Dunlap <randy.dunlap at oracle.com>

Fix printk formats:

drivers/video/fbmem.c: In function 'fb_do_apertures_overlap':
drivers/video/fbmem.c:1494: warning: format '%llx' expects type 'long long unsigned int', but argument 2 has type 'resource_size_t'
drivers/video/fbmem.c:1494: warning: format '%llx' expects type 'long long unsigned int', but argument 3 has type 'resource_size_t'
drivers/video/fbmem.c:1494: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'resource_size_t'
drivers/video/fbmem.c:1494: warning: format '%llx' expects type 'long long unsigned int', but argument 5 has type 'resource_size_t'

Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
---
 drivers/video/fbmem.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- linux-next-20100519.orig/drivers/video/fbmem.c
+++ linux-next-20100519/drivers/video/fbmem.c
@@ -1491,7 +1491,10 @@ static bool fb_do_apertures_overlap(stru
 		for (j = 0; j < gena->count; ++j) {
 			struct aperture *g = &gena->ranges[j];
 			printk(KERN_DEBUG "checking generic (%llx %llx) vs hw (%llx %llx)\n",
-				g->base, g->size, h->base, h->size);
+				(unsigned long long)g->base,
+				(unsigned long long)g->size,
+				(unsigned long long)h->base,
+				(unsigned long long)h->size);
 			if (apertures_overlap(g, h))
 				return true;
 		}