Hi Linus,
Sorry for the delay on this, I was waiting for feedback on a problem
which turned out to be a non-kernel problem.
Please pull:
git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup.git for-linus
H. Peter Anvin (2):
[x86 setup] Present the canonical video mode number to the kernel
[acpi] Correct the decoding of video mode numbers in wakeup.S
Paul Bolle (1):
[x86 setup] Fix typo in arch/i386/boot/header.S
arch/i386/boot/header.S | 2 +-
arch/i386/boot/video.c | 14 ++++++++---
arch/i386/kernel/acpi/wakeup.S | 41 ++++++++-------------------------
arch/x86_64/kernel/acpi/wakeup.S | 47 ++++++++++---------------------------
4 files changed, 34 insertions(+), 70 deletions(-)
[Log messages and full diffs follow]
commit bbc15f46fe4dc2862325e2b4ba474a854162e1a1
Author: Paul Bolle <pebolle@tiscali.nl>
Date: Mon Sep 10 23:39:02 2007 +0200
[x86 setup] Fix typo in arch/i386/boot/header.S
There's an obvious typo in arch/i386/boot/header.S (in your
linux-2.6-x86setup.git) that I noticed by just studying the code.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
diff --git a/arch/i386/boot/header.S b/arch/i386/boot/header.S
index 7f4a2c5..f3140e5 100644
--- a/arch/i386/boot/header.S
+++ b/arch/i386/boot/header.S
@@ -275,7 +275,7 @@ die:
hlt
jmp die
- .size die, .-due
+ .size die, .-die
.section ".initdata", "a"
setup_corrupt:
commit 91c4b8cb5ab8cc3e8352739e35699c0487a6b6f3
Author: H. Peter Anvin <hpa@zytor.com>
Date: Thu Sep 13 14:16:37 2007 -0700
[acpi] Correct the decoding of video mode numbers in wakeup.S
wakeup.S looks at the video mode number from the setup header and
looks to see if it is a VESA mode. Unfortunately, the decoding is
done incorrectly and it will attempt to frob the VESA BIOS for any
mode number 0x0200 or larger. Correct this,...
