diff options
| author | Michael Witrant <mike@lepton.fr> | 2009-09-01 10:46:50 +1000 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2009-09-01 11:25:49 +1000 |
| commit | 1c37be80982151a5acd74fe4b960695f604f22ca (patch) | |
| tree | 5975186d9f9365074063d9b33616f5e748812b09 /hw/xfree86 | |
| parent | 65183dc3153232943dff3cfbaacab141e7ed0e9c (diff) | |
XFree86: Linux: Fix 100% CPU usage with ShareVTs and kbd
Leave consoleFd open over the course of the server, even though any use
of it in this context is likely to be disastrous.
Signed-off-by: Michael Witrant <mike@lepton.fr>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Diffstat (limited to 'hw/xfree86')
| -rw-r--r-- | hw/xfree86/os-support/linux/lnx_init.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c index 64030072f..5a6db8081 100644 --- a/hw/xfree86/os-support/linux/lnx_init.c +++ b/hw/xfree86/os-support/linux/lnx_init.c @@ -286,9 +286,6 @@ xf86OpenConsole(void) /* we really should have a InitOSInputDevices() function instead * of Init?$#*&Device(). So I just place it here */ - - } else { /* ShareVTs */ - close(xf86Info.consoleFd); } } else { /* serverGeneration != 1 */ if (!ShareVTs && VTSwitch) @@ -317,7 +314,10 @@ xf86CloseConsole(void) int vtno = -1; #endif - if (ShareVTs) return; + if (ShareVTs) { + close(xf86Info.consoleFd); + return; + } if (console_handler) { xf86RemoveGeneralHandler(console_handler); |