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
Merge to Fedora kernel-2.6.18-1.2239_FC5 patched with stable patch-2.6.18.2-vs2.0...
[linux-2.6.git]
/
drivers
/
char
/
vt.c
diff --git
a/drivers/char/vt.c
b/drivers/char/vt.c
index
b217da7
..
4941c95
100644
(file)
--- a/
drivers/char/vt.c
+++ b/
drivers/char/vt.c
@@
-878,8
+878,17
@@
int vc_resize(struct vc_data *vc, unsigned int cols, unsigned int lines)
return err;
}
return err;
}
+int vc_lock_resize(struct vc_data *vc, unsigned int cols, unsigned int lines)
+{
+ int rc;
+
+ acquire_console_sem();
+ rc = vc_resize(vc, cols, lines);
+ release_console_sem();
+ return rc;
+}
-void vc_d
is
allocate(unsigned int currcons)
+void vc_d
e
allocate(unsigned int currcons)
{
WARN_CONSOLE_UNLOCKED();
{
WARN_CONSOLE_UNLOCKED();
@@
-3765,6
+3774,7
@@
EXPORT_SYMBOL(default_blu);
EXPORT_SYMBOL(update_region);
EXPORT_SYMBOL(redraw_screen);
EXPORT_SYMBOL(vc_resize);
EXPORT_SYMBOL(update_region);
EXPORT_SYMBOL(redraw_screen);
EXPORT_SYMBOL(vc_resize);
+EXPORT_SYMBOL(vc_lock_resize);
EXPORT_SYMBOL(fg_console);
EXPORT_SYMBOL(console_blank_hook);
EXPORT_SYMBOL(console_blanked);
EXPORT_SYMBOL(fg_console);
EXPORT_SYMBOL(console_blank_hook);
EXPORT_SYMBOL(console_blanked);