Commit 8909128d authored by Natanael Copa's avatar Natanael Copa

main/linux-vserver: upgrade to 2.6.35.7-vs2.3.0.36.33

parent a84ec7e3
......@@ -2,9 +2,9 @@
_flavor=vserver
pkgname=linux-${_flavor}
pkgver=2.6.32.24
pkgver=2.6.35.7
_kernver=2.6.32
_kernver=2.6.35
pkgrel=0
pkgdesc="Linux kernel with vserver"
url="http://linux-vserver.org/"
......@@ -15,8 +15,7 @@ _config=${config:-kernelconfig.${CARCH:-x86}}
install=
source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2
ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2
http://vserver.13thfloor.at/Experimental/patch-2.6.32.24-vs2.3.0.36.29.6.diff
x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch
http://vserver.13thfloor.at/Experimental/patch-2.6.35.7-vs2.3.0.36.33.diff
kernelconfig.x86
"
subpackages="$pkgname-dev"
......@@ -123,8 +122,7 @@ dev() {
"$subpkgdir"/lib/modules/${_abi_release}/build
}
md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2
e3346e3b4b92f048b8ecded829f45cdf patch-2.6.32.24.bz2
c2da2d30890d4ab2a5572d678439fd3c patch-2.6.32.24-vs2.3.0.36.29.6.diff
a1bcf76870b63a4a4035a8948fb758e2 x86-setup-When-restoring-the-screen-update-boot_params-screen_info.patch
720f799628747947e90eea9a813170cc kernelconfig.x86"
md5sums="091abeb4684ce03d1d936851618687b6 linux-2.6.35.tar.bz2
6a00ec267b0100f20a3fa900b97a5b7f patch-2.6.35.7.bz2
87f2232a85a8e5542c7933f2614d3622 patch-2.6.35.7-vs2.3.0.36.33.diff
10b1e713ce4422e69e1c96ba78feb7a9 kernelconfig.x86"
This diff is collapsed.
From f1f6baf8f1df29be38003089787e378567ce0086 Mon Sep 17 00:00:00 2001
From: H. Peter Anvin <hpa@zytor.com>
Date: Wed, 17 Feb 2010 18:32:06 -0800
Subject: [PATCH] x86, setup: When restoring the screen, update boot_params.screen_info
When we restore the screen content after a mode change, we return the
cursor to its former position. However, we need to also update
boot_params.screen_info accordingly, so that the decompression code
knows where on the screen the cursor is. Just in case the video BIOS
does something extra screwy, read the cursor position back from the
BIOS instead of relying on it doing the right thing.
While we're at it, make sure we cap the cursor position to the new
screen coordinates.
Reported-by: Wim Osterholt <wim@djo.tudelft.nl>
Bugzilla-Reference: http://bugzilla.kernel.org/show_bug.cgi?id=15329
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---
arch/x86/boot/video.c | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
index f767164..43eda28 100644
--- a/arch/x86/boot/video.c
+++ b/arch/x86/boot/video.c
@@ -298,11 +298,18 @@ static void restore_screen(void)
}
/* Restore cursor position */
+ if (saved.curx >= xs)
+ saved.curx = xs-1;
+ if (saved.cury >= ys)
+ saved.cury = ys-1;
+
initregs(&ireg);
ireg.ah = 0x02; /* Set cursor position */
ireg.dh = saved.cury;
ireg.dl = saved.curx;
intcall(0x10, &ireg, NULL);
+
+ store_cursor_position();
}
void set_video(void)
--
1.7.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