diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-04 09:03:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-04 09:03:07 -0700 |
| commit | 413df1cb434b9b73b517f78c231549add1ee1c99 (patch) | |
| tree | 53450295a81a1c73e806bf9e49022a3df05a30f9 /arch/x86 | |
| parent | 7f467cbff66a9f96dc7b1ee619a3fa54a80d0c79 (diff) | |
| parent | 29d274b8d3e2404cd1832b3a999b12f9d1e1d895 (diff) | |
| download | linux-413df1cb434b9b73b517f78c231549add1ee1c99.tar.gz linux-413df1cb434b9b73b517f78c231549add1ee1c99.tar.bz2 linux-413df1cb434b9b73b517f78c231549add1ee1c99.zip | |
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
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/sysfb_simplefb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/sysfb_simplefb.c b/arch/x86/kernel/sysfb_simplefb.c index 22513e96b012..86179d409893 100644 --- a/arch/x86/kernel/sysfb_simplefb.c +++ b/arch/x86/kernel/sysfb_simplefb.c @@ -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; |