diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-28 11:54:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-28 11:54:05 -0800 |
| commit | 6b90e71a472be131186276a5fd19d319fa2125d9 (patch) | |
| tree | d293856c79ae78907b6be9fcdc286a9814d56a1a | |
| parent | bcc8aff6af53907ecb60e5aa8b34fbd429408a7a (diff) | |
| parent | dacc9092336be20b01642afe1a51720b31f60369 (diff) | |
| download | linux-6b90e71a472be131186276a5fd19d319fa2125d9.tar.gz linux-6b90e71a472be131186276a5fd19d319fa2125d9.tar.bz2 linux-6b90e71a472be131186276a5fd19d319fa2125d9.zip | |
Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 boot update from Ingo Molnar:
"Two minor changes: fix an atypical binutils combination build bug, and
also fix a VRAM size check for simplefb"
* 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/sysfb: Fix check for bad VRAM size
x86/boot: Discard .eh_frame sections
| -rw-r--r-- | arch/x86/boot/setup.ld | 5 | ||||
| -rw-r--r-- | arch/x86/kernel/sysfb_simplefb.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/x86/boot/setup.ld b/arch/x86/boot/setup.ld index 0149e41d42c2..3da1c37c6dd5 100644 --- a/arch/x86/boot/setup.ld +++ b/arch/x86/boot/setup.ld @@ -51,7 +51,10 @@ SECTIONS . = ALIGN(16); _end = .; - /DISCARD/ : { *(.note*) } + /DISCARD/ : { + *(.eh_frame) + *(.note*) + } /* * The ASSERT() sink to . is intentional, for binutils 2.14 compatibility: diff --git a/arch/x86/kernel/sysfb_simplefb.c b/arch/x86/kernel/sysfb_simplefb.c index 01f0e2263b86..298fc1edd9c9 100644 --- a/arch/x86/kernel/sysfb_simplefb.c +++ b/arch/x86/kernel/sysfb_simplefb.c @@ -90,11 +90,11 @@ __init int create_simplefb(const struct screen_info *si, if (si->orig_video_isVGA == VIDEO_TYPE_VLFB) size <<= 16; length = mode->height * mode->stride; - length = PAGE_ALIGN(length); if (length > size) { printk(KERN_WARNING "sysfb: VRAM smaller than advertised\n"); return -EINVAL; } + length = PAGE_ALIGN(length); /* setup IORESOURCE_MEM as framebuffer memory */ memset(&res, 0, sizeof(res)); |