Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 198002
b: refs/heads/master
c: f4b87de
h: refs/heads/master
v: v3
  • Loading branch information
Randy Dunlap authored and Linus Torvalds committed May 22, 2010
1 parent 7c35737 commit f1a20db
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2faa4cf76e7d229016240b79b50a43d81f458323
refs/heads/master: f4b87dee923342505e1ddba8d34ce9de33e75050
5 changes: 4 additions & 1 deletion trunk/drivers/video/fbmem.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit f1a20db

Please sign in to comment.