diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 13:35:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 13:35:29 -0800 |
| commit | 830cd2ac6ecce6b027d947fcdc724dd27a33813a (patch) | |
| tree | 08d4f60e9176292f98e47d1f50b77f1f49ec0122 /arch/x86/boot | |
| parent | 64227cd83d5f9d7b7ce5514a693252c2952366f6 (diff) | |
| parent | b434a680a29424856e0f40199daa9f65963c7cb4 (diff) | |
| download | op-kernel-dev-830cd2ac6ecce6b027d947fcdc724dd27a33813a.zip op-kernel-dev-830cd2ac6ecce6b027d947fcdc724dd27a33813a.tar.gz | |
Merge branch 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
vgacon: Add support for setting the default cursor state
vc: Add support for hiding the cursor when creating VTs
x86, setup: Store the boot cursor state
Diffstat (limited to 'arch/x86/boot')
| -rw-r--r-- | arch/x86/boot/video.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c index d42da38..f767164 100644 --- a/arch/x86/boot/video.c +++ b/arch/x86/boot/video.c @@ -27,6 +27,12 @@ static void store_cursor_position(void) boot_params.screen_info.orig_x = oreg.dl; boot_params.screen_info.orig_y = oreg.dh; + + if (oreg.ch & 0x20) + boot_params.screen_info.flags |= VIDEO_FLAGS_NOCURSOR; + + if ((oreg.ch & 0x1f) > (oreg.cl & 0x1f)) + boot_params.screen_info.flags |= VIDEO_FLAGS_NOCURSOR; } static void store_video_mode(void) |
