summaryrefslogtreecommitdiff
path: root/hw/xfree86/common
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2018-08-22 14:57:05 -0400
committerAdam Jackson <ajax@nwnk.net>2018-09-12 20:47:15 +0000
commitc7414f4d07b69a4b2f0d0af06f032393cf5fe6aa (patch)
tree7e4ac98df214653278cf2f8e38f2325167ec6b22 /hw/xfree86/common
parentd1aeaad5c6fc614c28129f5d2717c12ff7320081 (diff)
xfree86: Remove NoTrapSignals
This was dangerous on UMS and largely pointless on KMS.
Diffstat (limited to 'hw/xfree86/common')
-rw-r--r--hw/xfree86/common/xf86Config.c4
-rw-r--r--hw/xfree86/common/xf86Globals.c1
-rw-r--r--hw/xfree86/common/xf86Init.c20
-rw-r--r--hw/xfree86/common/xf86Privstr.h1
4 files changed, 0 insertions, 26 deletions
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index e31030d63..ee5ab5d11 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -619,7 +619,6 @@ configFiles(XF86ConfFilesPtr fileconf)
}
typedef enum {
- FLAG_NOTRAPSIGNALS,
FLAG_DONTVTSWITCH,
FLAG_DONTZAP,
FLAG_DONTZOOM,
@@ -653,8 +652,6 @@ typedef enum {
* if the parser found the option in the config file.
*/
static OptionInfoRec FlagOptions[] = {
- {FLAG_NOTRAPSIGNALS, "NoTrapSignals", OPTV_BOOLEAN,
- {0}, FALSE},
{FLAG_DONTVTSWITCH, "DontVTSwitch", OPTV_BOOLEAN,
{0}, FALSE},
{FLAG_DONTZAP, "DontZap", OPTV_BOOLEAN,
@@ -737,7 +734,6 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
xf86ProcessOptions(-1, optp, FlagOptions);
- xf86GetOptValBool(FlagOptions, FLAG_NOTRAPSIGNALS, &xf86Info.notrapSignals);
xf86GetOptValBool(FlagOptions, FLAG_DONTVTSWITCH, &xf86Info.dontVTSwitch);
xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap);
xf86GetOptValBool(FlagOptions, FLAG_DONTZOOM, &xf86Info.dontZoom);
diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
index e08aa5bf1..193f17aec 100644
--- a/hw/xfree86/common/xf86Globals.c
+++ b/hw/xfree86/common/xf86Globals.c
@@ -108,7 +108,6 @@ xf86InfoRec xf86Info = {
.ShareVTs = FALSE,
.dontZap = FALSE,
.dontZoom = FALSE,
- .notrapSignals = FALSE,
.currentScreen = NULL,
#ifdef CSRG_BASED
.consType = -1,
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 0a5af8272..8f50580fe 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -233,24 +233,6 @@ xf86PrivsElevated(void)
}
static void
-TrapSignals(void)
-{
- if (xf86Info.notrapSignals) {
- OsSignal(SIGSEGV, SIG_DFL);
- OsSignal(SIGABRT, SIG_DFL);
- OsSignal(SIGILL, SIG_DFL);
-#ifdef SIGEMT
- OsSignal(SIGEMT, SIG_DFL);
-#endif
- OsSignal(SIGFPE, SIG_DFL);
- OsSignal(SIGBUS, SIG_DFL);
- OsSignal(SIGSYS, SIG_DFL);
- OsSignal(SIGXCPU, SIG_DFL);
- OsSignal(SIGXFSZ, SIG_DFL);
- }
-}
-
-static void
AddSeatId(CallbackListPtr *pcbl, void *data, void *screen)
{
ScreenPtr pScreen = screen;
@@ -356,8 +338,6 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
}
}
- TrapSignals();
-
/* Initialise the loader */
LoaderInit();
diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h
index 21c2e1fe4..55d1b2455 100644
--- a/hw/xfree86/common/xf86Privstr.h
+++ b/hw/xfree86/common/xf86Privstr.h
@@ -63,7 +63,6 @@ typedef struct {
Bool ShareVTs;
Bool dontZap;
Bool dontZoom;
- Bool notrapSignals; /* don't exit cleanly - die at fault */
/* graphics part */
ScreenPtr currentScreen;