xnu-6153.121.1.tar.gz

[apple/xnu.git] / bsd / sys / signal.h

diff --git a/bsd/sys/signal.h b/bsd/sys/signal.h
index 0ec1754362d847a6e0da7478d8855419d8b2c4cd..594d6a67049bf9df024fc002d9cf1ab57b096dd2 100644 (file)
--- a/bsd/sys/signal.h
+++ b/bsd/sys/signal.h
@@ -2,7 +2,7 @@
  * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

- * 
+ *

  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in


@@ -11,10 +11,10 @@
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.
  * unlawful or unlicensed copies of an Apple operating system, or to
  * circumvent, violate, or enable the circumvention or violation of, any
  * terms of an Apple operating system software license agreement.

- * 
+ *

  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this file.

- * 
+ *

  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,


@@ -22,7 +22,7 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.

- * 
+ *

  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */


@@ -66,60 +66,61 @@
  *     @(#)signal.h    8.2 (Berkeley) 1/21/94
  */
 
  *     @(#)signal.h    8.2 (Berkeley) 1/21/94
  */
 

-#ifndef        _SYS_SIGNAL_H_
-#define        _SYS_SIGNAL_H_
+#ifndef _SYS_SIGNAL_H_
+#define _SYS_SIGNAL_H_

 
 #include <sys/cdefs.h>
 #include <sys/appleapiopts.h>
 
 #include <sys/cdefs.h>
 #include <sys/appleapiopts.h>

+#include <Availability.h>

 
 

-#define __DARWIN_NSIG  32      /* counting 0; could be 33 (mask is 1-32) */
+#define __DARWIN_NSIG   32      /* counting 0; could be 33 (mask is 1-32) */

 
 #if !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
 
 #if !defined(_ANSI_SOURCE) && (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))

-#define NSIG   __DARWIN_NSIG
+#define NSIG    __DARWIN_NSIG

 #endif
 
 #endif
 

-#include <machine/signal.h>    /* sigcontext; codes for SIGILL, SIGFPE */
+#include <machine/signal.h>     /* sigcontext; codes for SIGILL, SIGFPE */

 
 

-#define        SIGHUP  1       /* hangup */
-#define        SIGINT  2       /* interrupt */
-#define        SIGQUIT 3       /* quit */
-#define        SIGILL  4       /* illegal instruction (not reset when caught) */
-#define        SIGTRAP 5       /* trace trap (not reset when caught) */
-#define        SIGABRT 6       /* abort() */
+#define SIGHUP  1       /* hangup */
+#define SIGINT  2       /* interrupt */
+#define SIGQUIT 3       /* quit */
+#define SIGILL  4       /* illegal instruction (not reset when caught) */
+#define SIGTRAP 5       /* trace trap (not reset when caught) */
+#define SIGABRT 6       /* abort() */

 #if  (defined(_POSIX_C_SOURCE) && !defined(_DARWIN_C_SOURCE))
 #if  (defined(_POSIX_C_SOURCE) && !defined(_DARWIN_C_SOURCE))

-#define        SIGPOLL 7       /* pollable event ([XSR] generated, not supported) */
-#else  /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-#define        SIGIOT  SIGABRT /* compatibility */
-#define        SIGEMT  7       /* EMT instruction */
-#endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-#define        SIGFPE  8       /* floating point exception */
-#define        SIGKILL 9       /* kill (cannot be caught or ignored) */
-#define        SIGBUS  10      /* bus error */
-#define        SIGSEGV 11      /* segmentation violation */
-#define        SIGSYS  12      /* bad argument to system call */
-#define        SIGPIPE 13      /* write on a pipe with no one to read it */
-#define        SIGALRM 14      /* alarm clock */
-#define        SIGTERM 15      /* software termination signal from kill */
-#define        SIGURG  16      /* urgent condition on IO channel */
-#define        SIGSTOP 17      /* sendable stop signal not from tty */
-#define        SIGTSTP 18      /* stop signal from tty */
-#define        SIGCONT 19      /* continue a stopped process */
-#define        SIGCHLD 20      /* to parent on child stop or exit */
-#define        SIGTTIN 21      /* to readers pgrp upon background tty read */
-#define        SIGTTOU 22      /* like TTIN for output if (tp->t_local&LTOSTOP) */
+#define SIGPOLL 7       /* pollable event ([XSR] generated, not supported) */
+#else   /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+#define SIGIOT  SIGABRT /* compatibility */
+#define SIGEMT  7       /* EMT instruction */
+#endif  /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+#define SIGFPE  8       /* floating point exception */
+#define SIGKILL 9       /* kill (cannot be caught or ignored) */
+#define SIGBUS  10      /* bus error */
+#define SIGSEGV 11      /* segmentation violation */
+#define SIGSYS  12      /* bad argument to system call */
+#define SIGPIPE 13      /* write on a pipe with no one to read it */
+#define SIGALRM 14      /* alarm clock */
+#define SIGTERM 15      /* software termination signal from kill */
+#define SIGURG  16      /* urgent condition on IO channel */
+#define SIGSTOP 17      /* sendable stop signal not from tty */
+#define SIGTSTP 18      /* stop signal from tty */
+#define SIGCONT 19      /* continue a stopped process */
+#define SIGCHLD 20      /* to parent on child stop or exit */
+#define SIGTTIN 21      /* to readers pgrp upon background tty read */
+#define SIGTTOU 22      /* like TTIN for output if (tp->t_local&LTOSTOP) */

 #if  (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
 #if  (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))

-#define        SIGIO   23      /* input/output possible signal */
+#define SIGIO   23      /* input/output possible signal */

 #endif
 #endif

-#define        SIGXCPU 24      /* exceeded CPU time limit */
-#define        SIGXFSZ 25      /* exceeded file size limit */
-#define        SIGVTALRM 26    /* virtual time alarm */
-#define        SIGPROF 27      /* profiling time alarm */
+#define SIGXCPU 24      /* exceeded CPU time limit */
+#define SIGXFSZ 25      /* exceeded file size limit */
+#define SIGVTALRM 26    /* virtual time alarm */
+#define SIGPROF 27      /* profiling time alarm */

 #if  (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))
 #if  (!defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE))

-#define SIGWINCH 28    /* window size changes */
-#define SIGINFO        29      /* information request */
+#define SIGWINCH 28     /* window size changes */
+#define SIGINFO 29      /* information request */

 #endif
 #endif

-#define SIGUSR1 30     /* user defined signal 1 */
-#define SIGUSR2 31     /* user defined signal 2 */
+#define SIGUSR1 30      /* user defined signal 1 */
+#define SIGUSR2 31      /* user defined signal 2 */

 
 #if defined(_ANSI_SOURCE) || __DARWIN_UNIX03 || defined(__cplusplus)
 /*
 
 #if defined(_ANSI_SOURCE) || __DARWIN_UNIX03 || defined(__cplusplus)
 /*


@@ -127,184 +128,170 @@
  * actually supply three.  Ugh!
  * SIG_HOLD is chosen to avoid KERN_SIG_* values in <sys/signalvar.h>
  */
  * actually supply three.  Ugh!
  * SIG_HOLD is chosen to avoid KERN_SIG_* values in <sys/signalvar.h>
  */

-#define        SIG_DFL         (void (*)(int))0
-#define        SIG_IGN         (void (*)(int))1
-#define        SIG_HOLD        (void (*)(int))5
-#define        SIG_ERR         ((void (*)(int))-1)
+#define SIG_DFL         (void (*)(int))0
+#define SIG_IGN         (void (*)(int))1
+#define SIG_HOLD        (void (*)(int))5
+#define SIG_ERR         ((void (*)(int))-1)

 #else
 /* DO NOT REMOVE THE COMMENTED OUT int: fixincludes needs to see them */
 #else
 /* DO NOT REMOVE THE COMMENTED OUT int: fixincludes needs to see them */

-#define        SIG_DFL         (void (*)(/*int*/))0
-#define        SIG_IGN         (void (*)(/*int*/))1
-#define        SIG_HOLD        (void (*)(/*int*/))5
-#define        SIG_ERR         ((void (*)(/*int*/))-1)
+#define SIG_DFL         (void (*)( /*int*/ ))0
+#define SIG_IGN         (void (*)( /*int*/ ))1
+#define SIG_HOLD        (void (*)( /*int*/ ))5
+#define SIG_ERR         ((void (*)( /*int*/ ))-1)

 #endif
 
 #ifndef _ANSI_SOURCE
 #include <sys/_types.h>
 
 #endif
 
 #ifndef _ANSI_SOURCE
 #include <sys/_types.h>
 

-#define __need_mcontext_t
-#define __need_stack_t
-#define __need_ucontext_t
-#include <sys/_structs.h>
-
-#ifndef _PID_T
-#define _PID_T
-typedef __darwin_pid_t                 pid_t;
-#endif
-
-#ifndef _PTHREAD_ATTR_T
-#define _PTHREAD_ATTR_T
-typedef __darwin_pthread_attr_t                pthread_attr_t;
-#endif
+#include <machine/_mcontext.h>

 
 

-#ifndef _SIGSET_T
-#define _SIGSET_T
-typedef __darwin_sigset_t              sigset_t;
-#endif
+#ifndef KERNEL
+#include <sys/_pthread/_pthread_attr_t.h>
+#endif /* KERNEL */

 
 

-#ifndef        _SIZE_T
-#define        _SIZE_T
-typedef        __darwin_size_t                 size_t;
-#endif
+#include <sys/_types/_sigaltstack.h>
+#include <sys/_types/_ucontext.h>

 
 

-#ifndef _UID_T
-#define _UID_T
-typedef __darwin_uid_t                 uid_t;
-#endif
+#include <sys/_types/_pid_t.h>
+#include <sys/_types/_sigset_t.h>
+#include <sys/_types/_size_t.h>
+#include <sys/_types/_uid_t.h>

 
 union sigval {
        /* Members as suggested by Annex C of POSIX 1003.1b. */
 
 union sigval {
        /* Members as suggested by Annex C of POSIX 1003.1b. */

-       int     sival_int;
-       void    *sival_ptr;
+       int     sival_int;
+       void    *sival_ptr;

 };
 
 };
 

-#define        SIGEV_NONE      0       /* No async notification */
-#define        SIGEV_SIGNAL    1       /* aio - completion notification */
-#define        SIGEV_THREAD    3       /* [NOTIMP] [RTS] call notification function */
+#define SIGEV_NONE      0       /* No async notification */
+#define SIGEV_SIGNAL    1       /* aio - completion notification */
+#define SIGEV_THREAD    3       /* [NOTIMP] [RTS] call notification function */

 
 

+#ifndef KERNEL

 struct sigevent {
 struct sigevent {

-       int                             sigev_notify;                           /* Notification type */
-       int                             sigev_signo;                            /* Signal number */
-       union sigval    sigev_value;                            /* Signal value */
-       void                    (*sigev_notify_function)(union sigval);   /* Notification function */
-       pthread_attr_t  *sigev_notify_attributes;       /* Notification attributes */
+       int                             sigev_notify;                           /* Notification type */
+       int                             sigev_signo;                            /* Signal number */
+       union sigval    sigev_value;                            /* Signal value */
+       void                    (*sigev_notify_function)(union sigval);   /* Notification function */
+       pthread_attr_t  *sigev_notify_attributes;       /* Notification attributes */

 };
 };

+#endif /* KERNEL */

 
 #ifdef BSD_KERNEL_PRIVATE
 
 union user64_sigval {
        struct {
 
 #ifdef BSD_KERNEL_PRIVATE
 
 union user64_sigval {
        struct {

-               uint32_t                pad;    /* assumes Motorola byte order */
-               int32_t                 sival_int;
+               uint32_t                pad;    /* assumes Motorola byte order */
+               int32_t                 sival_int;

        } size_equivalent;
        } size_equivalent;

-       user64_addr_t   sival_ptr;
+       user64_addr_t   sival_ptr;

 };
 
 union user32_sigval {
        /* Members as suggested by Annex C of POSIX 1003.1b. */
 };
 
 union user32_sigval {
        /* Members as suggested by Annex C of POSIX 1003.1b. */

-       int32_t sival_int;
+       int32_t sival_int;

        user32_addr_t sival_ptr;
 };
 
 union user_sigval {
        struct {
        user32_addr_t sival_ptr;
 };
 
 union user_sigval {
        struct {

-               uint32_t                pad;    /* assumes Motorola byte order */
-               int32_t                 sival_int;
+               uint32_t                pad;    /* assumes Motorola byte order */
+               int32_t                 sival_int;

        } size_equivalent;
        user_addr_t sival_ptr;
 };
 
 struct user64_sigevent {
        } size_equivalent;
        user_addr_t sival_ptr;
 };
 
 struct user64_sigevent {

-       int             sigev_notify;                   /* Notification type */
-       int             sigev_signo;                    /* Signal number */
-       union user64_sigval sigev_value;                        /* Signal value */
-       user64_addr_t   sigev_notify_function;          /* Notify function */
-       user64_addr_t   sigev_notify_attributes;        /* Notify attributes */
+       int             sigev_notify;                   /* Notification type */
+       int             sigev_signo;                    /* Signal number */
+       union user64_sigval sigev_value;                        /* Signal value */
+       user64_addr_t   sigev_notify_function;          /* Notify function */
+       user64_addr_t   sigev_notify_attributes;        /* Notify attributes */

 };
 
 struct user32_sigevent {
 };
 
 struct user32_sigevent {

-       int             sigev_notify;                   /* Notification type */
-       int             sigev_signo;                    /* Signal number */
-       union user32_sigval sigev_value;                        /* Signal value */
-       user32_addr_t   sigev_notify_function;          /* Notify function */
-       user32_addr_t   sigev_notify_attributes;        /* Notify attributes */
+       int             sigev_notify;                   /* Notification type */
+       int             sigev_signo;                    /* Signal number */
+       union user32_sigval sigev_value;                        /* Signal value */
+       user32_addr_t   sigev_notify_function;          /* Notify function */
+       user32_addr_t   sigev_notify_attributes;        /* Notify attributes */

 };
 
 struct user_sigevent {
 };
 
 struct user_sigevent {

-       int             sigev_notify;                   /* Notification type */
-       int             sigev_signo;                    /* Signal number */
-       union user_sigval sigev_value;                  /* Signal value */
-       user_addr_t     sigev_notify_function;          /* Notify function */
-       user_addr_t     sigev_notify_attributes;        /* Notify attributes */
+       int             sigev_notify;                   /* Notification type */
+       int             sigev_signo;                    /* Signal number */
+       union user_sigval sigev_value;                  /* Signal value */
+       user_addr_t     sigev_notify_function;          /* Notify function */
+       user_addr_t     sigev_notify_attributes;        /* Notify attributes */

 };
 
 };
 

-#endif /* BSD_KERNEL_PRIVATE */
+#endif  /* BSD_KERNEL_PRIVATE */

 
 typedef struct __siginfo {
 
 typedef struct __siginfo {

-       int     si_signo;               /* signal number */
-       int     si_errno;               /* errno association */
-       int     si_code;                /* signal code */
-       pid_t   si_pid;                 /* sending process */
-       uid_t   si_uid;                 /* sender's ruid */
-       int     si_status;              /* exit value */
-       void    *si_addr;               /* faulting instruction */
-       union sigval si_value;          /* signal value */
-       long    si_band;                /* band event for SIGPOLL */
-       unsigned long   __pad[7];       /* Reserved for Future Use */
+       int     si_signo;               /* signal number */
+       int     si_errno;               /* errno association */
+       int     si_code;                /* signal code */
+       pid_t   si_pid;                 /* sending process */
+       uid_t   si_uid;                 /* sender's ruid */
+       int     si_status;              /* exit value */
+       void    *si_addr;               /* faulting instruction */
+       union sigval si_value;          /* signal value */
+       long    si_band;                /* band event for SIGPOLL */
+       unsigned long   __pad[7];       /* Reserved for Future Use */

 } siginfo_t;
 
 #ifdef BSD_KERNEL_PRIVATE
 
 typedef struct user_siginfo {
 } siginfo_t;
 
 #ifdef BSD_KERNEL_PRIVATE
 
 typedef struct user_siginfo {

-       int             si_signo;       /* signal number */
-       int             si_errno;       /* errno association */
-       int             si_code;        /* signal code */
-       pid_t           si_pid;         /* sending process */
-       uid_t           si_uid;         /* sender's ruid */
-       int             si_status;      /* exit value */
-       user_addr_t     si_addr;        /* faulting instruction (see below) */
-       union user_sigval si_value;     /* signal value */
-       user_long_t     si_band;        /* band event for SIGPOLL */
-       user_ulong_t    pad[7];         /* Reserved for Future Use */
+       int             si_signo;       /* signal number */
+       int             si_errno;       /* errno association */
+       int             si_code;        /* signal code */
+       pid_t           si_pid;         /* sending process */
+       uid_t           si_uid;         /* sender's ruid */
+       int             si_status;      /* exit value */
+       user_addr_t     si_addr;        /* faulting instruction (see below) */
+       union user_sigval si_value;     /* signal value */
+       user_long_t     si_band;        /* band event for SIGPOLL */
+       user_ulong_t    pad[7];         /* Reserved for Future Use */

 } user_siginfo_t;
 
 typedef struct user64_siginfo {
 } user_siginfo_t;
 
 typedef struct user64_siginfo {

-       int             si_signo;       /* signal number */
-       int             si_errno;       /* errno association */
-       int             si_code;        /* signal code */
-       pid_t           si_pid;         /* sending process */
-       uid_t           si_uid;         /* sender's ruid */
-       int             si_status;      /* exit value */
-       user64_addr_t   si_addr;        /* faulting instruction (see below) */
-       union user64_sigval si_value;   /* signal value */
-       user64_long_t   si_band;        /* band event for SIGPOLL */
-       user64_ulong_t  __pad[7];               /* Reserved for Future Use */
+       int             si_signo;       /* signal number */
+       int             si_errno;       /* errno association */
+       int             si_code;        /* signal code */
+       pid_t           si_pid;         /* sending process */
+       uid_t           si_uid;         /* sender's ruid */
+       int             si_status;      /* exit value */
+       user64_addr_t   si_addr;        /* faulting instruction (see below) */
+       union user64_sigval si_value;   /* signal value */
+       user64_long_t   si_band;        /* band event for SIGPOLL */
+       user64_ulong_t  __pad[7];               /* Reserved for Future Use */

 } user64_siginfo_t;
 
 typedef struct user32_siginfo {
 } user64_siginfo_t;
 
 typedef struct user32_siginfo {

-       int             si_signo;       /* signal number */
-       int             si_errno;       /* errno association */
-       int             si_code;        /* signal code */
-       pid_t           si_pid;         /* sending process */
-       uid_t           si_uid;         /* sender's ruid */
-       int             si_status;      /* exit value */
-       user32_addr_t   si_addr;        /* faulting instruction (see below) */
-       union user32_sigval     si_value;       /* signal value */
-       user32_long_t   si_band;        /* band event for SIGPOLL */
-       user32_ulong_t  __pad[7];               /* Reserved for Future Use */
+       int             si_signo;       /* signal number */
+       int             si_errno;       /* errno association */
+       int             si_code;        /* signal code */
+       pid_t           si_pid;         /* sending process */
+       uid_t           si_uid;         /* sender's ruid */
+       int             si_status;      /* exit value */
+       user32_addr_t   si_addr;        /* faulting instruction (see below) */
+       union user32_sigval     si_value;       /* signal value */
+       user32_long_t   si_band;        /* band event for SIGPOLL */
+       user32_ulong_t  __pad[7];               /* Reserved for Future Use */

 } user32_siginfo_t;
 
 void siginfo_user_to_user32(user_siginfo_t *, user32_siginfo_t *);
 void siginfo_user_to_user64(user_siginfo_t *, user64_siginfo_t *);
 
 } user32_siginfo_t;
 
 void siginfo_user_to_user32(user_siginfo_t *, user32_siginfo_t *);
 void siginfo_user_to_user64(user_siginfo_t *, user64_siginfo_t *);
 

-#endif /* BSD_KERNEL_PRIVATE */
+#endif  /* BSD_KERNEL_PRIVATE */

 
 

-/* 
- * When the signal is SIGILL or SIGFPE, si_addr contains the address of 
+/*
+ * When the signal is SIGILL or SIGFPE, si_addr contains the address of

  * the faulting instruction.
  * the faulting instruction.

- * When the signal is SIGSEGV or SIGBUS, si_addr contains the address of 
+ * When the signal is SIGSEGV or SIGBUS, si_addr contains the address of

  * the faulting memory reference. Although for x86 there are cases of SIGSEGV
  * the faulting memory reference. Although for x86 there are cases of SIGSEGV

- * for which si_addr cannot be determined and is NULL. 
+ * for which si_addr cannot be determined and is NULL.

  * If the signal is SIGCHLD, the si_pid field will contain the child process ID,
  *  si_status contains the exit value or signal and
  *  si_uid contains the real user ID of the process that sent the signal.
  * If the signal is SIGCHLD, the si_pid field will contain the child process ID,
  *  si_status contains the exit value or signal and
  *  si_uid contains the real user ID of the process that sent the signal.


@@ -314,93 +301,93 @@ void siginfo_user_to_user64(user_siginfo_t *, user64_siginfo_t *);
 
 /* Codes for SIGILL */
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
 
 /* Codes for SIGILL */
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)

-#define        ILL_NOOP        0       /* if only I knew... */
+#define ILL_NOOP        0       /* if only I knew... */

 #endif
 #endif

-#define        ILL_ILLOPC      1       /* [XSI] illegal opcode */
-#define        ILL_ILLTRP      2       /* [XSI] illegal trap */
-#define        ILL_PRVOPC      3       /* [XSI] privileged opcode */
-#define        ILL_ILLOPN      4       /* [XSI] illegal operand -NOTIMP */
-#define        ILL_ILLADR      5       /* [XSI] illegal addressing mode -NOTIMP */
-#define        ILL_PRVREG      6       /* [XSI] privileged register -NOTIMP */
-#define        ILL_COPROC      7       /* [XSI] coprocessor error -NOTIMP */
-#define        ILL_BADSTK      8       /* [XSI] internal stack error -NOTIMP */
+#define ILL_ILLOPC      1       /* [XSI] illegal opcode */
+#define ILL_ILLTRP      2       /* [XSI] illegal trap */
+#define ILL_PRVOPC      3       /* [XSI] privileged opcode */
+#define ILL_ILLOPN      4       /* [XSI] illegal operand -NOTIMP */
+#define ILL_ILLADR      5       /* [XSI] illegal addressing mode -NOTIMP */
+#define ILL_PRVREG      6       /* [XSI] privileged register -NOTIMP */
+#define ILL_COPROC      7       /* [XSI] coprocessor error -NOTIMP */
+#define ILL_BADSTK      8       /* [XSI] internal stack error -NOTIMP */

 
 /* Codes for SIGFPE */
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
 
 /* Codes for SIGFPE */
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)

-#define        FPE_NOOP        0       /* if only I knew... */
+#define FPE_NOOP        0       /* if only I knew... */

 #endif
 #endif

-#define FPE_FLTDIV     1       /* [XSI] floating point divide by zero */
-#define FPE_FLTOVF     2       /* [XSI] floating point overflow */
-#define FPE_FLTUND     3       /* [XSI] floating point underflow */
-#define FPE_FLTRES     4       /* [XSI] floating point inexact result */
-#define FPE_FLTINV     5       /* [XSI] invalid floating point operation */
-#define        FPE_FLTSUB      6       /* [XSI] subscript out of range -NOTIMP */
-#define        FPE_INTDIV      7       /* [XSI] integer divide by zero */
-#define        FPE_INTOVF      8       /* [XSI] integer overflow */
+#define FPE_FLTDIV      1       /* [XSI] floating point divide by zero */
+#define FPE_FLTOVF      2       /* [XSI] floating point overflow */
+#define FPE_FLTUND      3       /* [XSI] floating point underflow */
+#define FPE_FLTRES      4       /* [XSI] floating point inexact result */
+#define FPE_FLTINV      5       /* [XSI] invalid floating point operation */
+#define FPE_FLTSUB      6       /* [XSI] subscript out of range -NOTIMP */
+#define FPE_INTDIV      7       /* [XSI] integer divide by zero */
+#define FPE_INTOVF      8       /* [XSI] integer overflow */

 
 /* Codes for SIGSEGV */
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
 
 /* Codes for SIGSEGV */
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)

-#define        SEGV_NOOP       0       /* if only I knew... */
+#define SEGV_NOOP       0       /* if only I knew... */

 #endif
 #endif

-#define        SEGV_MAPERR     1       /* [XSI] address not mapped to object */
-#define        SEGV_ACCERR     2       /* [XSI] invalid permission for mapped object */
+#define SEGV_MAPERR     1       /* [XSI] address not mapped to object */
+#define SEGV_ACCERR     2       /* [XSI] invalid permission for mapped object */

 
 /* Codes for SIGBUS */
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
 
 /* Codes for SIGBUS */
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)

-#define        BUS_NOOP        0       /* if only I knew... */
+#define BUS_NOOP        0       /* if only I knew... */

 #endif
 #endif

-#define        BUS_ADRALN      1       /* [XSI] Invalid address alignment */
-#define        BUS_ADRERR      2       /* [XSI] Nonexistent physical address -NOTIMP */
-#define        BUS_OBJERR      3       /* [XSI] Object-specific HW error - NOTIMP */
+#define BUS_ADRALN      1       /* [XSI] Invalid address alignment */
+#define BUS_ADRERR      2       /* [XSI] Nonexistent physical address -NOTIMP */
+#define BUS_OBJERR      3       /* [XSI] Object-specific HW error - NOTIMP */

 
 /* Codes for SIGTRAP */
 
 /* Codes for SIGTRAP */

-#define        TRAP_BRKPT      1       /* [XSI] Process breakpoint -NOTIMP */
-#define        TRAP_TRACE      2       /* [XSI] Process trace trap -NOTIMP */
+#define TRAP_BRKPT      1       /* [XSI] Process breakpoint -NOTIMP */
+#define TRAP_TRACE      2       /* [XSI] Process trace trap -NOTIMP */

 
 /* Codes for SIGCHLD */
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
 
 /* Codes for SIGCHLD */
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)

-#define        CLD_NOOP        0       /* if only I knew... */
+#define CLD_NOOP        0       /* if only I knew... */

 #endif
 #endif

-#define        CLD_EXITED      1       /* [XSI] child has exited */
-#define        CLD_KILLED      2       /* [XSI] terminated abnormally, no core file */
-#define        CLD_DUMPED      3       /* [XSI] terminated abnormally, core file */
-#define        CLD_TRAPPED     4       /* [XSI] traced child has trapped */
-#define        CLD_STOPPED     5       /* [XSI] child has stopped */
-#define        CLD_CONTINUED   6       /* [XSI] stopped child has continued */
+#define CLD_EXITED      1       /* [XSI] child has exited */
+#define CLD_KILLED      2       /* [XSI] terminated abnormally, no core file */
+#define CLD_DUMPED      3       /* [XSI] terminated abnormally, core file */
+#define CLD_TRAPPED     4       /* [XSI] traced child has trapped */
+#define CLD_STOPPED     5       /* [XSI] child has stopped */
+#define CLD_CONTINUED   6       /* [XSI] stopped child has continued */

 
 /* Codes for SIGPOLL */
 
 /* Codes for SIGPOLL */

-#define        POLL_IN         1       /* [XSR] Data input available */
-#define        POLL_OUT        2       /* [XSR] Output buffers available */
-#define        POLL_MSG        3       /* [XSR] Input message available */
-#define        POLL_ERR        4       /* [XSR] I/O error */
-#define        POLL_PRI        5       /* [XSR] High priority input available */
-#define        POLL_HUP        6       /* [XSR] Device disconnected */
+#define POLL_IN         1       /* [XSR] Data input available */
+#define POLL_OUT        2       /* [XSR] Output buffers available */
+#define POLL_MSG        3       /* [XSR] Input message available */
+#define POLL_ERR        4       /* [XSR] I/O error */
+#define POLL_PRI        5       /* [XSR] High priority input available */
+#define POLL_HUP        6       /* [XSR] Device disconnected */

 
 /* union for signal handlers */
 union __sigaction_u {
        void    (*__sa_handler)(int);
        void    (*__sa_sigaction)(int, struct __siginfo *,
 
 /* union for signal handlers */
 union __sigaction_u {
        void    (*__sa_handler)(int);
        void    (*__sa_sigaction)(int, struct __siginfo *,

-                      void *);
+           void *);

 };
 
 /* Signal vector template for Kernel user boundary */
 };
 
 /* Signal vector template for Kernel user boundary */

-struct __sigaction {
+struct  __sigaction {

        union __sigaction_u __sigaction_u;  /* signal handler */
        void    (*sa_tramp)(void *, int, int, siginfo_t *, void *);
        union __sigaction_u __sigaction_u;  /* signal handler */
        void    (*sa_tramp)(void *, int, int, siginfo_t *, void *);

-       sigset_t sa_mask;               /* signal mask to apply */
-       int     sa_flags;               /* see signal options below */
+       sigset_t sa_mask;               /* signal mask to apply */
+       int     sa_flags;               /* see signal options below */

 };
 
 /*
  * Signal vector "template" used in sigaction call.
  */
 };
 
 /*
  * Signal vector "template" used in sigaction call.
  */

-struct sigaction {
+struct  sigaction {

        union __sigaction_u __sigaction_u;  /* signal handler */
        union __sigaction_u __sigaction_u;  /* signal handler */

-       sigset_t sa_mask;               /* signal mask to apply */
-       int     sa_flags;               /* see signal options below */
+       sigset_t sa_mask;               /* signal mask to apply */
+       int     sa_flags;               /* see signal options below */

 };
 
 };
 

-#ifdef BSD_KERNEL_PRIVATE
+#ifdef  BSD_KERNEL_PRIVATE

 #include <machine/types.h>
 
 union __user32_sigaction_u {
 #include <machine/types.h>
 
 union __user32_sigaction_u {


@@ -408,86 +395,89 @@ union __user32_sigaction_u {
        user32_addr_t __sa_sigaction;
 };
 
        user32_addr_t __sa_sigaction;
 };
 

-struct user32_sigaction {
+struct  user32_sigaction {

        union __user32_sigaction_u __sigaction_u;  /* signal handler */
        union __user32_sigaction_u __sigaction_u;  /* signal handler */

-       sigset_t sa_mask;               /* signal mask to apply */
-       int     sa_flags;               /* see signal options below */
+       sigset_t sa_mask;               /* signal mask to apply */
+       int     sa_flags;               /* see signal options below */

 };
 
 };
 

-struct __user32_sigaction {
+struct  __user32_sigaction {

        union __user32_sigaction_u __sigaction_u;  /* signal handler */
        user32_addr_t sa_tramp;
        union __user32_sigaction_u __sigaction_u;  /* signal handler */
        user32_addr_t sa_tramp;

-       sigset_t sa_mask;               /* signal mask to apply */
-       int     sa_flags;               /* see signal options below */
+       sigset_t sa_mask;               /* signal mask to apply */
+       int     sa_flags;               /* see signal options below */

 };
 
 union __user64_sigaction_u {
 };
 
 union __user64_sigaction_u {

-       user64_addr_t   __sa_handler;
-       user64_addr_t   __sa_sigaction;
+       user64_addr_t   __sa_handler;
+       user64_addr_t   __sa_sigaction;

 };
 
 };
 

-struct user64_sigaction {
+struct  user64_sigaction {

        union __user64_sigaction_u __sigaction_u;  /* signal handler */
        union __user64_sigaction_u __sigaction_u;  /* signal handler */

-       sigset_t sa_mask;               /* signal mask to apply */
-       int     sa_flags;               /* see signal options below */
+       sigset_t sa_mask;               /* signal mask to apply */
+       int     sa_flags;               /* see signal options below */

 };
 
 };
 

-struct __user64_sigaction {
+struct  __user64_sigaction {

        union __user64_sigaction_u __sigaction_u;  /* signal handler */
        union __user64_sigaction_u __sigaction_u;  /* signal handler */

-       user64_addr_t   sa_tramp;       /* signal mask to apply */
-       sigset_t sa_mask;               /* signal mask to apply */
-       int     sa_flags;               /* see signal options below */
+       user64_addr_t   sa_tramp;       /* signal mask to apply */
+       sigset_t sa_mask;               /* signal mask to apply */
+       int     sa_flags;               /* see signal options below */

 };
 
 union __kern_sigaction_u {
 };
 
 union __kern_sigaction_u {

-       user_addr_t     __sa_handler;
-       user_addr_t     __sa_sigaction;
+       user_addr_t     __sa_handler;
+       user_addr_t     __sa_sigaction;

 };
 
 };
 

-struct kern_sigaction {
+struct  kern_sigaction {

        union __kern_sigaction_u __sigaction_u;  /* signal handler */
        union __kern_sigaction_u __sigaction_u;  /* signal handler */

-       sigset_t sa_mask;               /* signal mask to apply */
-       int     sa_flags;               /* see signal options below */
+       sigset_t sa_mask;               /* signal mask to apply */
+       int     sa_flags;               /* see signal options below */

 };
 
 };
 

-struct __kern_sigaction {
+struct  __kern_sigaction {

        union __kern_sigaction_u __sigaction_u;  /* signal handler */
        union __kern_sigaction_u __sigaction_u;  /* signal handler */

-       user_addr_t     sa_tramp;       /* signal mask to apply */
-       sigset_t sa_mask;               /* signal mask to apply */
-       int     sa_flags;               /* see signal options below */
+       user_addr_t     sa_tramp;       /* signal mask to apply */
+       sigset_t sa_mask;               /* signal mask to apply */
+       int     sa_flags;               /* see signal options below */

 };
 
 #undef SIG_DFL
 #undef SIG_IGN
 #undef SIG_ERR
 };
 
 #undef SIG_DFL
 #undef SIG_IGN
 #undef SIG_ERR

-#define  SIG_DFL       ((user_addr_t)0LL)
-#define  SIG_IGN       ((user_addr_t)1LL)
-#define  SIG_ERR       ((user_addr_t)-1LL)
+#define  SIG_DFL        ((user_addr_t)0LL)
+#define  SIG_IGN        ((user_addr_t)1LL)
+#define  SIG_ERR        ((user_addr_t)-1LL)

 
 

-#endif /* BSD_KERNEL_PRIVATE */
+#endif  /* BSD_KERNEL_PRIVATE */

 
 
 /* if SA_SIGINFO is set, sa_sigaction is to be used instead of sa_handler. */
 
 
 /* if SA_SIGINFO is set, sa_sigaction is to be used instead of sa_handler. */

-#define        sa_handler      __sigaction_u.__sa_handler
-#define        sa_sigaction    __sigaction_u.__sa_sigaction
-
-#define SA_ONSTACK     0x0001  /* take signal on signal stack */
-#define SA_RESTART     0x0002  /* restart system on signal return */
-#ifdef BSD_KERNEL_PRIVATE
-#define        SA_DISABLE      0x0004  /* disable taking signals on alternate stack - for user_sigaltstack.ss_flags only */
-#endif /* BSD_KERNEL_PRIVATE */
-#define        SA_RESETHAND    0x0004  /* reset to SIG_DFL when taking signal */
-#define SA_NOCLDSTOP   0x0008  /* do not generate SIGCHLD on child stop */
-#define        SA_NODEFER      0x0010  /* don't mask the signal we're delivering */
-#define        SA_NOCLDWAIT    0x0020  /* don't keep zombies around */
-#define        SA_SIGINFO      0x0040  /* signal handler with SA_SIGINFO args */
+#define sa_handler      __sigaction_u.__sa_handler
+#define sa_sigaction    __sigaction_u.__sa_sigaction
+
+#define SA_ONSTACK      0x0001  /* take signal on signal stack */
+#define SA_RESTART      0x0002  /* restart system on signal return */
+#ifdef  BSD_KERNEL_PRIVATE
+#define SA_DISABLE      0x0004  /* disable taking signals on alternate stack - for user_sigaltstack.ss_flags only */
+#endif  /* BSD_KERNEL_PRIVATE */
+#define SA_RESETHAND    0x0004  /* reset to SIG_DFL when taking signal */
+#define SA_NOCLDSTOP    0x0008  /* do not generate SIGCHLD on child stop */
+#define SA_NODEFER      0x0010  /* don't mask the signal we're delivering */
+#define SA_NOCLDWAIT    0x0020  /* don't keep zombies around */
+#define SA_SIGINFO      0x0040  /* signal handler with SA_SIGINFO args */

 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)

-#define        SA_USERTRAMP    0x0100  /* do not bounce off kernel's sigtramp */
+#define SA_USERTRAMP    0x0100  /* do not bounce off kernel's sigtramp */

 /* This will provide 64bit register set in a 32bit user address space */
 /* This will provide 64bit register set in a 32bit user address space */

-#define        SA_64REGSET     0x0200  /* signal handler with SA_SIGINFO args with 64bit regs information */
+#define SA_64REGSET     0x0200  /* signal handler with SA_SIGINFO args with 64bit regs information */

 #endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
 #endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */

+#ifdef  BSD_KERNEL_PRIVATE
+#define SA_VALIDATE_SIGRETURN_FROM_SIGTRAMP     0x0400  /* use token to validate sigreturn was called from matching sigtramp */
+#endif  /* BSD_KERNEL_PRIVATE */

 
 

-/* the following are the only bits we support from user space, the 
+/* the following are the only bits we support from user space, the

  * rest are for kernel use only.
  */
 #define SA_USERSPACE_MASK (SA_ONSTACK | SA_RESTART | SA_RESETHAND | SA_NOCLDSTOP | SA_NODEFER | SA_NOCLDWAIT | SA_SIGINFO)
  * rest are for kernel use only.
  */
 #define SA_USERSPACE_MASK (SA_ONSTACK | SA_RESTART | SA_RESETHAND | SA_NOCLDSTOP | SA_NODEFER | SA_NOCLDWAIT | SA_SIGINFO)


@@ -495,78 +485,78 @@ struct    __kern_sigaction {
 /*
  * Flags for sigprocmask:
  */
 /*
  * Flags for sigprocmask:
  */

-#define        SIG_BLOCK       1       /* block specified signal set */
-#define        SIG_UNBLOCK     2       /* unblock specified signal set */
-#define        SIG_SETMASK     3       /* set specified signal set */
+#define SIG_BLOCK       1       /* block specified signal set */
+#define SIG_UNBLOCK     2       /* unblock specified signal set */
+#define SIG_SETMASK     3       /* set specified signal set */

 
 /* POSIX 1003.1b required values. */
 
 /* POSIX 1003.1b required values. */

-#define SI_USER                0x10001 /* [CX] signal from kill() */
-#define SI_QUEUE       0x10002 /* [CX] signal from sigqueue() */
-#define SI_TIMER       0x10003 /* [CX] timer expiration */
-#define SI_ASYNCIO     0x10004 /* [CX] aio request completion */
-#define SI_MESGQ       0x10005 /* [CX] from message arrival on empty queue */
+#define SI_USER         0x10001 /* [CX] signal from kill() */
+#define SI_QUEUE        0x10002 /* [CX] signal from sigqueue() */
+#define SI_TIMER        0x10003 /* [CX] timer expiration */
+#define SI_ASYNCIO      0x10004 /* [CX] aio request completion */
+#define SI_MESGQ        0x10005 /* [CX]        from message arrival on empty queue */

 
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
 
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)

-typedef        void (*sig_t)(int);     /* type of signal function */
+typedef void (*sig_t)(int);     /* type of signal function */

 #endif
 
 /*
  * Structure used in sigaltstack call.
  */
 #endif
 
 /*
  * Structure used in sigaltstack call.
  */

-#ifdef BSD_KERNEL_PRIVATE
+#ifdef  BSD_KERNEL_PRIVATE

 
 struct  user32_sigaltstack {
 
 struct  user32_sigaltstack {

-       user32_addr_t   ss_sp;          /* signal stack base */
-       user32_size_t   ss_size;        /* signal stack length */
-       int                 ss_flags;   /* SA_DISABLE and/or SA_ONSTACK */
+       user32_addr_t   ss_sp;          /* signal stack base */
+       user32_size_t   ss_size;        /* signal stack length */
+       int                 ss_flags;   /* SA_DISABLE and/or SA_ONSTACK */

 };
 
 struct  user64_sigaltstack {
 };
 
 struct  user64_sigaltstack {

-       user64_addr_t   ss_sp;          /* signal stack base */
-       user64_size_t   ss_size;        /* signal stack length */
-       int             ss_flags;       /* SA_DISABLE and/or SA_ONSTACK */
+       user64_addr_t   ss_sp;          /* signal stack base */
+       user64_size_t   ss_size;        /* signal stack length */
+       int             ss_flags;       /* SA_DISABLE and/or SA_ONSTACK */

 };
 
 struct  kern_sigaltstack {
 };
 
 struct  kern_sigaltstack {

-       user_addr_t     ss_sp;          /* signal stack base */
-       user_size_t     ss_size;        /* signal stack length */
-       int             ss_flags;       /* SA_DISABLE and/or SA_ONSTACK */
+       user_addr_t     ss_sp;          /* signal stack base */
+       user_size_t     ss_size;        /* signal stack length */
+       int             ss_flags;       /* SA_DISABLE and/or SA_ONSTACK */

 };
 
 };
 

-#endif /* BSD_KERNEL_PRIVATE */
+#endif  /* BSD_KERNEL_PRIVATE */

 
 

-#define SS_ONSTACK     0x0001  /* take signal on signal stack */
-#define        SS_DISABLE      0x0004  /* disable taking signals on alternate stack */
-#define        MINSIGSTKSZ     32768   /* (32K)minimum allowable stack */
-#define        SIGSTKSZ        131072  /* (128K)recommended stack size */
+#define SS_ONSTACK      0x0001  /* take signal on signal stack */
+#define SS_DISABLE      0x0004  /* disable taking signals on alternate stack */
+#define MINSIGSTKSZ     32768   /* (32K)minimum allowable stack */
+#define SIGSTKSZ        131072  /* (128K)recommended stack size */

 
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
 /*
  * 4.3 compatibility:
  * Signal vector "template" used in sigvec call.
  */
 
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
 /*
  * 4.3 compatibility:
  * Signal vector "template" used in sigvec call.
  */

-struct sigvec {
-       void    (*sv_handler)(int);     /* signal handler */
-       int     sv_mask;                /* signal mask to apply */
-       int     sv_flags;               /* see signal options below */
+struct  sigvec {
+       void    (*sv_handler)(int);     /* signal handler */
+       int     sv_mask;                /* signal mask to apply */
+       int     sv_flags;               /* see signal options below */

 };
 
 };
 

-#define SV_ONSTACK     SA_ONSTACK
-#define SV_INTERRUPT   SA_RESTART      /* same bit, opposite sense */
-#define SV_RESETHAND   SA_RESETHAND
-#define SV_NODEFER     SA_NODEFER
-#define SV_NOCLDSTOP   SA_NOCLDSTOP
-#define SV_SIGINFO     SA_SIGINFO
+#define SV_ONSTACK      SA_ONSTACK
+#define SV_INTERRUPT    SA_RESTART      /* same bit, opposite sense */
+#define SV_RESETHAND    SA_RESETHAND
+#define SV_NODEFER      SA_NODEFER
+#define SV_NOCLDSTOP    SA_NOCLDSTOP
+#define SV_SIGINFO      SA_SIGINFO

 
 

-#define sv_onstack sv_flags    /* isn't compatibility wonderful! */
+#define sv_onstack sv_flags     /* isn't compatibility wonderful! */

 #endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
 
 /*
  * Structure used in sigstack call.
  */
 #endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
 
 /*
  * Structure used in sigstack call.
  */

-struct sigstack {
-       char    *ss_sp;                 /* signal stack pointer */
-       int     ss_onstack;             /* current status */
+struct  sigstack {
+       char    *ss_sp;                 /* signal stack pointer */
+       int     ss_onstack;             /* current status */

 };
 
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
 };
 
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)


@@ -574,42 +564,42 @@ struct    sigstack {
  * Macro for converting signal number to a mask suitable for
  * sigblock().
  */
  * Macro for converting signal number to a mask suitable for
  * sigblock().
  */

-#define sigmask(m)     (1 << ((m)-1))
+#define sigmask(m)      (1 << ((m)-1))

 
 

-#ifdef BSD_KERNEL_PRIVATE
+#ifdef  KERNEL_PRIVATE

 /*
  *     signals delivered on a per-thread basis.
  */
 #define threadmask (sigmask(SIGILL)|sigmask(SIGTRAP)|\
 /*
  *     signals delivered on a per-thread basis.
  */
 #define threadmask (sigmask(SIGILL)|sigmask(SIGTRAP)|\

-                   sigmask(SIGIOT)|sigmask(SIGEMT)|\
-                   sigmask(SIGFPE)|sigmask(SIGBUS)|\
-                   sigmask(SIGSEGV)|sigmask(SIGSYS)|\
-                   sigmask(SIGPIPE))
+                   sigmask(SIGABRT)|sigmask(SIGEMT)|\
+                   sigmask(SIGFPE)|sigmask(SIGBUS)|\
+                   sigmask(SIGSEGV)|sigmask(SIGSYS)|\
+                   sigmask(SIGPIPE)|sigmask(SIGKILL))

 
 

-#define workq_threadmask (threadmask | sigcantmask)
+#define workq_threadmask ((threadmask | sigcantmask | sigmask(SIGPROF)) & ~sigmask(SIGABRT))

 
 /*
  * Signals carried across exec.
  */
 #define execmask   (sigmask(SIGHUP)|sigmask(SIGINT)|\
 
 /*
  * Signals carried across exec.
  */
 #define execmask   (sigmask(SIGHUP)|sigmask(SIGINT)|\

-                   sigmask(SIGQUIT)|sigmask(SIGKILL)|\
-                   sigmask(SIGTERM)|sigmask(SIGSTOP)|\
-                   sigmask(SIGTSTP)|sigmask(SIGCONT)|\
-                   sigmask(SIGTTIN)|sigmask(SIGTTOU)|\
-                   sigmask(SIGUSR1)|sigmask(SIGUSR2))
+                   sigmask(SIGQUIT)|sigmask(SIGKILL)|\
+                   sigmask(SIGTERM)|sigmask(SIGSTOP)|\
+                   sigmask(SIGTSTP)|sigmask(SIGCONT)|\
+                   sigmask(SIGTTIN)|sigmask(SIGTTOU)|\
+                   sigmask(SIGUSR1)|sigmask(SIGUSR2))

 
 

-#endif /* BSD_KERNEL_PRIVATE */
+#endif  /* KERNEL_PRIVATE */

 
 

-#define        BADSIG          SIG_ERR
+#define BADSIG          SIG_ERR

 
 

-#endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
-#endif /* !_ANSI_SOURCE */
+#endif  /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
+#endif  /* !_ANSI_SOURCE */

 
 /*
  * For historical reasons; programs expect signal's return value to be
  * defined by <sys/signal.h>.
  */
 __BEGIN_DECLS
 
 /*
  * For historical reasons; programs expect signal's return value to be
  * defined by <sys/signal.h>.
  */
 __BEGIN_DECLS

-void   (*signal(int, void (*)(int)))(int);
+    void(*signal(int, void (*)(int)))(int);

 __END_DECLS
 __END_DECLS

-#endif /* !_SYS_SIGNAL_H_ */
+#endif  /* !_SYS_SIGNAL_H_ */