fbmem: avoid printk format warning with 32-bit resources
Randy Dunlap [Fri, 21 May 2010 19:44:47 +0000 (12:44 -0700)]
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@oracle.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

drivers/video/fbmem.c

index e08b7b5..731fce6 100644 (file)
@@ -1491,7 +1491,10 @@ static bool fb_do_apertures_overlap(struct apertures_struct *gena,
                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;
                }