summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-08-15 09:31:24 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-15 09:31:24 -0700
commite3bdaeb603ab7ac941b35b41856c6b8ebf47c6bb (patch)
tree87df4a6aad12086b99936397f11a9a4ebae0b92a /init
parent417e3041b8b6ba9582c2e4d2003cfcd77435fc21 (diff)
parent2765e4fb39af2f8260de1177027e292f2a7198bd (diff)
downloadsystem_core-e3bdaeb603ab7ac941b35b41856c6b8ebf47c6bb.zip
system_core-e3bdaeb603ab7ac941b35b41856c6b8ebf47c6bb.tar.gz
system_core-e3bdaeb603ab7ac941b35b41856c6b8ebf47c6bb.tar.bz2
am 2765e4fb: Merge "Use sigemptyset to initialise signal mask as it is more portable. Referencing sa_restorer fails on MIPS"
* commit '2765e4fb39af2f8260de1177027e292f2a7198bd': Use sigemptyset to initialise signal mask as it is more portable. Referencing sa_restorer fails on MIPS
Diffstat (limited to 'init')
-rw-r--r--init/signal_handler.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/init/signal_handler.c b/init/signal_handler.c
index b170132..abccb40 100644
--- a/init/signal_handler.c
+++ b/init/signal_handler.c
@@ -131,11 +131,9 @@ void signal_init(void)
int s[2];
struct sigaction act;
-
+ memset(&act, 0, sizeof(act));
act.sa_handler = sigchld_handler;
act.sa_flags = SA_NOCLDSTOP;
- act.sa_mask = 0;
- act.sa_restorer = NULL;
sigaction(SIGCHLD, &act, 0);
/* create a signalling mechanism for the sigchld handler */