Commit 413df1cb authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fixes from Ingo Molnar:
 "Two simplefb fixes"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/simplefb: Mark framebuffer mem-resources as IORESOURCE_BUSY to avoid bootup warning
  x86/simplefb: Fix overflow causing bogus fall-back
parents 7f467cbf 29d274b8
...@@ -72,14 +72,14 @@ __init int create_simplefb(const struct screen_info *si, ...@@ -72,14 +72,14 @@ __init int create_simplefb(const struct screen_info *si,
* the part that is occupied by the framebuffer */ * the part that is occupied by the framebuffer */
len = mode->height * mode->stride; len = mode->height * mode->stride;
len = PAGE_ALIGN(len); len = PAGE_ALIGN(len);
if (len > si->lfb_size << 16) { if (len > (u64)si->lfb_size << 16) {
printk(KERN_WARNING "sysfb: VRAM smaller than advertised\n"); printk(KERN_WARNING "sysfb: VRAM smaller than advertised\n");
return -EINVAL; return -EINVAL;
} }
/* setup IORESOURCE_MEM as framebuffer memory */ /* setup IORESOURCE_MEM as framebuffer memory */
memset(&res, 0, sizeof(res)); memset(&res, 0, sizeof(res));
res.flags = IORESOURCE_MEM; res.flags = IORESOURCE_MEM | IORESOURCE_BUSY;
res.name = simplefb_resname; res.name = simplefb_resname;
res.start = si->lfb_base; res.start = si->lfb_base;
res.end = si->lfb_base + len - 1; res.end = si->lfb_base + len - 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment