diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-01-31 22:22:27 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-01-31 22:22:27 +0000 |
| commit | 825423e4c4f18289df2393951cfd2a7a31fc0464 (patch) | |
| tree | 4ad80e981c3d9effa910d2247d118d254f9a5d09 /include/asm-alpha | |
| parent | c4693dc4856ab907a5c02187a8d398861bebfc7e (diff) | |
Merge with Linux 2.4.1.
Diffstat (limited to 'include/asm-alpha')
| -rw-r--r-- | include/asm-alpha/errno.h | 2 | ||||
| -rw-r--r-- | include/asm-alpha/unistd.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-alpha/errno.h b/include/asm-alpha/errno.h index 724f03b77..fd5b8fafc 100644 --- a/include/asm-alpha/errno.h +++ b/include/asm-alpha/errno.h @@ -139,4 +139,6 @@ #define ENOMEDIUM 129 /* No medium found */ #define EMEDIUMTYPE 130 /* Wrong medium type */ +#define EHASHCOLLISION 131 /* Number of hash collisons exceeds maximum generation counter value. */ + #endif diff --git a/include/asm-alpha/unistd.h b/include/asm-alpha/unistd.h index 4a5b98607..265c1b2dc 100644 --- a/include/asm-alpha/unistd.h +++ b/include/asm-alpha/unistd.h @@ -572,7 +572,6 @@ static inline long sync(void) return sys_sync(); } -extern long sys_wait4(int, int *, int, struct rusage *); static inline pid_t waitpid(int pid, int * wait_stat, int flags) { return sys_wait4(pid, wait_stat, flags, NULL); |