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
This commit is contained in:
@@ -14,7 +14,8 @@ struct screen_info {
|
||||
__u16 orig_video_page; /* 0x04 */
|
||||
__u8 orig_video_mode; /* 0x06 */
|
||||
__u8 orig_video_cols; /* 0x07 */
|
||||
__u16 unused2; /* 0x08 */
|
||||
__u8 flags; /* 0x08 */
|
||||
__u8 unused2; /* 0x09 */
|
||||
__u16 orig_video_ega_bx;/* 0x0a */
|
||||
__u16 unused3; /* 0x0c */
|
||||
__u8 orig_video_lines; /* 0x0e */
|
||||
@@ -65,6 +66,8 @@ struct screen_info {
|
||||
|
||||
#define VIDEO_TYPE_EFI 0x70 /* EFI graphic mode */
|
||||
|
||||
#define VIDEO_FLAGS_NOCURSOR (1 << 0) /* The video mode has no cursor set */
|
||||
|
||||
#ifdef __KERNEL__
|
||||
extern struct screen_info screen_info;
|
||||
|
||||
|
||||
@@ -110,6 +110,7 @@ extern char con_buf[CON_BUF_SIZE];
|
||||
extern struct mutex con_buf_mtx;
|
||||
extern char vt_dont_switch;
|
||||
extern int default_utf8;
|
||||
extern int global_cursor_default;
|
||||
|
||||
struct vt_spawn_console {
|
||||
spinlock_t lock;
|
||||
@@ -130,4 +131,6 @@ struct vt_notifier_param {
|
||||
extern int register_vt_notifier(struct notifier_block *nb);
|
||||
extern int unregister_vt_notifier(struct notifier_block *nb);
|
||||
|
||||
extern void hide_boot_cursor(bool hide);
|
||||
|
||||
#endif /* _VT_KERN_H */
|
||||
|
||||
Reference in New Issue
Block a user