am 05f0bfd6: Merge "Don\'t mask out SA_RESTORER from sa_flags."

* commit '05f0bfd6c56746aa4f737804ebb62b555dc0d921':
  Don't mask out SA_RESTORER from sa_flags.
This commit is contained in:
Elliott Hughes
2014-09-04 22:20:50 +00:00
committed by Android Git Automerger
2 changed files with 11 additions and 9 deletions

View File

@@ -64,10 +64,6 @@ int sigaction(int signal, const struct sigaction* bionic_new_action, struct siga
bionic_old_action->sa_mask = kernel_old_action.sa_mask;
#ifdef SA_RESTORER
bionic_old_action->sa_restorer = kernel_old_action.sa_restorer;
if (bionic_old_action->sa_restorer == &__rt_sigreturn) {
bionic_old_action->sa_flags &= ~SA_RESTORER;
}
#endif
}