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>
This commit is contained in:
parent
65183dc315
commit
1c37be8098
|
@ -286,9 +286,6 @@ xf86OpenConsole(void)
|
||||||
|
|
||||||
/* we really should have a InitOSInputDevices() function instead
|
/* we really should have a InitOSInputDevices() function instead
|
||||||
* of Init?$#*&Device(). So I just place it here */
|
* of Init?$#*&Device(). So I just place it here */
|
||||||
|
|
||||||
} else { /* ShareVTs */
|
|
||||||
close(xf86Info.consoleFd);
|
|
||||||
}
|
}
|
||||||
} else { /* serverGeneration != 1 */
|
} else { /* serverGeneration != 1 */
|
||||||
if (!ShareVTs && VTSwitch)
|
if (!ShareVTs && VTSwitch)
|
||||||
|
@ -317,7 +314,10 @@ xf86CloseConsole(void)
|
||||||
int vtno = -1;
|
int vtno = -1;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (ShareVTs) return;
|
if (ShareVTs) {
|
||||||
|
close(xf86Info.consoleFd);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (console_handler) {
|
if (console_handler) {
|
||||||
xf86RemoveGeneralHandler(console_handler);
|
xf86RemoveGeneralHandler(console_handler);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user