Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[karo-tx-linux.git] / arch / mips / include / uapi / asm / signal.h

diff --git a/arch/mips/include/uapi/asm/signal.h b/arch/mips/include/uapi/asm/signal.h
index 6783c887a678d4756d12de9e69e4d9b68cf666ed..d6b18b4d0f3a99c7c96f58a27d77c1fd62777f61 100644 (file)
--- a/arch/mips/include/uapi/asm/signal.h
+++ b/arch/mips/include/uapi/asm/signal.h
@@ -24,28 +24,28 @@ typedef unsigned long old_sigset_t;         /* at least 32 bits */
 #define SIGHUP          1      /* Hangup (POSIX).  */
 #define SIGINT          2      /* Interrupt (ANSI).  */
 #define SIGQUIT                 3      /* Quit (POSIX).  */
-#define SIGILL          4      /* Illegal instruction (ANSI).  */
-#define SIGTRAP                 5      /* Trace trap (POSIX).  */
-#define SIGIOT          6      /* IOT trap (4.2 BSD).  */
-#define SIGABRT                 SIGIOT /* Abort (ANSI).  */
+#define SIGILL          4      /* Illegal instruction (ANSI).  */
+#define SIGTRAP                 5      /* Trace trap (POSIX).  */
+#define SIGIOT          6      /* IOT trap (4.2 BSD).  */
+#define SIGABRT                 SIGIOT /* Abort (ANSI).  */
 #define SIGEMT          7
 #define SIGFPE          8      /* Floating-point exception (ANSI).  */
 #define SIGKILL                 9      /* Kill, unblockable (POSIX).  */
-#define SIGBUS         10      /* BUS error (4.2 BSD).  */
+#define SIGBUS         10      /* BUS error (4.2 BSD).  */
 #define SIGSEGV                11      /* Segmentation violation (ANSI).  */
 #define SIGSYS         12
-#define SIGPIPE                13      /* Broken pipe (POSIX).  */
-#define SIGALRM                14      /* Alarm clock (POSIX).  */
-#define SIGTERM                15      /* Termination (ANSI).  */
+#define SIGPIPE                13      /* Broken pipe (POSIX).  */
+#define SIGALRM                14      /* Alarm clock (POSIX).  */
+#define SIGTERM                15      /* Termination (ANSI).  */
 #define SIGUSR1                16      /* User-defined signal 1 (POSIX).  */
 #define SIGUSR2                17      /* User-defined signal 2 (POSIX).  */
 #define SIGCHLD                18      /* Child status has changed (POSIX).  */
-#define SIGCLD         SIGCHLD /* Same as SIGCHLD (System V).  */
+#define SIGCLD         SIGCHLD /* Same as SIGCHLD (System V).  */
 #define SIGPWR         19      /* Power failure restart (System V).  */
 #define SIGWINCH       20      /* Window size change (4.3 BSD, Sun).  */
 #define SIGURG         21      /* Urgent condition on socket (4.2 BSD).  */
-#define SIGIO          22      /* I/O now possible (4.2 BSD).  */
-#define SIGPOLL                SIGIO   /* Pollable event occurred (System V).  */
+#define SIGIO          22      /* I/O now possible (4.2 BSD).  */
+#define SIGPOLL                SIGIO   /* Pollable event occurred (System V).  */
 #define SIGSTOP                23      /* Stop, unblockable (POSIX).  */
 #define SIGTSTP                24      /* Keyboard stop (POSIX).  */
 #define SIGCONT                25      /* Continue (POSIX).  */
@@ -54,7 +54,7 @@ typedef unsigned long old_sigset_t;           /* at least 32 bits */
 #define SIGVTALRM      28      /* Virtual alarm clock (4.2 BSD).  */
 #define SIGPROF                29      /* Profiling alarm clock (4.2 BSD).  */
 #define SIGXCPU                30      /* CPU limit exceeded (4.2 BSD).  */
-#define SIGXFSZ                31      /* File size limit exceeded (4.2 BSD).  */
+#define SIGXFSZ                31      /* File size limit exceeded (4.2 BSD).  */
 
 /* These should not be considered constants from userland.  */
 #define SIGRTMIN       32