diff options
| author | Jens Axboe <axboe@burns.home.kernel.dk> | 2002-02-07 10:37:19 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@burns.home.kernel.dk> | 2002-02-07 10:37:19 +0100 |
| commit | 2adf779dd193e1c8673f5896da4fef1dda830774 (patch) | |
| tree | f8014bbf33b023dd09bda6f9145bb776f73389d2 /include/asm-s390 | |
| parent | 07916eb45f4a6c63acb93e269c10490e4e623a0c (diff) | |
| parent | 0ec120046dee44027a28b66a3c28d1031982a9eb (diff) | |
Merge http://linux.bkbits.net/linux-2.5
into burns.home.kernel.dk:/usr/local/kernel/BK/linux-2.5
Diffstat (limited to 'include/asm-s390')
| -rw-r--r-- | include/asm-s390/siginfo.h | 1 | ||||
| -rw-r--r-- | include/asm-s390/unistd.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-s390/siginfo.h b/include/asm-s390/siginfo.h index 876e8baaec0a..1a6401075e81 100644 --- a/include/asm-s390/siginfo.h +++ b/include/asm-s390/siginfo.h @@ -115,6 +115,7 @@ typedef struct siginfo { #define SI_MESGQ -3 /* sent by real time mesq state change */ #define SI_ASYNCIO -4 /* sent by AIO completion */ #define SI_SIGIO -5 /* sent by queued SIGIO */ +#define SI_TKILL -6 /* sent by tkill system call */ #define SI_FROMUSER(siptr) ((siptr)->si_code <= 0) #define SI_FROMKERNEL(siptr) ((siptr)->si_code > 0) diff --git a/include/asm-s390/unistd.h b/include/asm-s390/unistd.h index 2c5a01426b1f..77ff9ccfb2fd 100644 --- a/include/asm-s390/unistd.h +++ b/include/asm-s390/unistd.h @@ -211,6 +211,8 @@ #define __NR_mincore 218 #define __NR_madvise 219 #define __NR_getdents64 220 +#define __NR_gettid 226 +#define __NR_tkill 227 /* user-visible error numbers are in the range -1 - -122: see <asm-s390/errno.h> */ |