x86 fixes
Linus,
Please pull the latest x86-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-urgent-for-linus
HEAD: 29d274b8d3e2404cd1832b3a999b12f9d1e1d895 x86/simplefb: Mark framebuffer mem-resources as IORESOURCE_BUSY to avoid bootup warning
Two simplefb fixes.
Thanks,
Ingo
------------------>
David Herrmann (1):
x86/simplefb: Mark framebuffer mem-resources as IORESOURCE_BUSY to avoid bootup warning
Tom Gundersen (1):
x86/simplefb: Fix overflow causing bogus fall-back
arch/x86/kernel/sysfb_simplefb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/sysfb_simplefb.c +2 -2
@@ -72,14 +72,14 @@ __init int create_simplefb(const struct screen_info *si,* the part that is occupied by the framebuffer */ len = mode->height * mode->stride; 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" );return -EINVAL ; }/* setup IORESOURCE_MEM as framebuffer memory */ memset (&res,0 ,sizeof (res)); - res.flags =IORESOURCE_MEM ; + res.flags =IORESOURCE_MEM |IORESOURCE_BUSY ; res.name = simplefb_resname; res.start = si->lfb_base; res.end = si->lfb_base + len -1 ;