git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
include
/
linux
/
vt_kern.h
diff --git
a/include/linux/vt_kern.h
b/include/linux/vt_kern.h
index
c310bca
..
6dbef2f
100644
(file)
--- a/
include/linux/vt_kern.h
+++ b/
include/linux/vt_kern.h
@@
-11,6
+11,7
@@
#include <linux/kd.h>
#include <linux/tty.h>
#include <linux/console_struct.h>
#include <linux/kd.h>
#include <linux/tty.h>
#include <linux/console_struct.h>
+#include <linux/mm.h>
/*
* Presently, a lot of graphics programs do not restore the contents of
/*
* Presently, a lot of graphics programs do not restore the contents of
@@
-49,6
+50,10
@@
void do_unblank_screen(int leaving_gfx);
void unblank_screen(void);
void poke_blanked_console(void);
int con_font_op(int currcons, struct console_font_op *op);
void unblank_screen(void);
void poke_blanked_console(void);
int con_font_op(int currcons, struct console_font_op *op);
+int con_font_set(int currcons, struct console_font_op *op);
+int con_font_get(int currcons, struct console_font_op *op);
+int con_font_default(int currcons, struct console_font_op *op);
+int con_font_copy(int currcons, struct console_font_op *op);
int con_set_cmap(unsigned char __user *cmap);
int con_get_cmap(unsigned char __user *cmap);
void scrollback(int);
int con_set_cmap(unsigned char __user *cmap);
int con_get_cmap(unsigned char __user *cmap);
void scrollback(int);
@@
-84,4
+89,12
@@
int vt_waitactive(int vt);
void change_console(unsigned int);
void reset_vc(unsigned int new_console);
void change_console(unsigned int);
void reset_vc(unsigned int new_console);
+/*
+ * vc_screen.c shares this temporary buffer with the console write code so that
+ * we can easily avoid touching user space while holding the console spinlock.
+ */
+#define CON_BUF_SIZE PAGE_SIZE
+extern char con_buf[CON_BUF_SIZE];
+extern struct semaphore con_buf_sem;
+
#endif /* _VT_KERN_H */
#endif /* _VT_KERN_H */