aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2010-05-21 15:44:47 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-21 23:30:33 -0400
commitf4b87dee923342505e1ddba8d34ce9de33e75050 (patch)
tree8940649c70ce9cee1186e602d7ad81de06bbbcec /drivers/video
parent2faa4cf76e7d229016240b79b50a43d81f458323 (diff)
fbmem: avoid printk format warning with 32-bit resources
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>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbmem.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index e08b7b5cb326..731fce64df9d 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -1491,7 +1491,10 @@ static bool fb_do_apertures_overlap(struct apertures_struct *gena,
1491 for (j = 0; j < gena->count; ++j) { 1491 for (j = 0; j < gena->count; ++j) {
1492 struct aperture *g = &gena->ranges[j]; 1492 struct aperture *g = &gena->ranges[j];
1493 printk(KERN_DEBUG "checking generic (%llx %llx) vs hw (%llx %llx)\n", 1493 printk(KERN_DEBUG "checking generic (%llx %llx) vs hw (%llx %llx)\n",
1494 g->base, g->size, h->base, h->size); 1494 (unsigned long long)g->base,
1495 (unsigned long long)g->size,
1496 (unsigned long long)h->base,
1497 (unsigned long long)h->size);
1495 if (apertures_overlap(g, h)) 1498 if (apertures_overlap(g, h))
1496 return true; 1499 return true;
1497 } 1500 }