diff options
| author | Roland McGrath <roland@gnu.org> | 2000-02-05 12:21:17 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2000-02-05 12:21:17 +0000 |
| commit | e5f75e8ece5d1a8d3c17bd0156082caf153d3779 (patch) | |
| tree | 316ee48be396f95770ccd5511ea442b83cadca51 /pfinet/linux-src/include/linux/sched.h | |
| parent | b39cd08347c72483a4521a55301a0fa147a2a2b1 (diff) | |
Import of Linux 2.2.14 subset (ipv4 stack and related)
Diffstat (limited to 'pfinet/linux-src/include/linux/sched.h')
| -rw-r--r-- | pfinet/linux-src/include/linux/sched.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pfinet/linux-src/include/linux/sched.h b/pfinet/linux-src/include/linux/sched.h index 4a5ffd58..d983c17e 100644 --- a/pfinet/linux-src/include/linux/sched.h +++ b/pfinet/linux-src/include/linux/sched.h @@ -3,7 +3,7 @@ #include <asm/param.h> /* for HZ */ -extern unsigned long event; +extern unsigned long global_event; #include <linux/binfmts.h> #include <linux/personality.h> @@ -657,12 +657,12 @@ static inline int expand_files(struct files_struct *files, int nr) if (nr >= files->max_fdset) { expand = 1; - if ((err = expand_fdset(files, nr))) + if ((err = expand_fdset(files, nr + 1))) goto out; } if (nr >= files->max_fds) { expand = 1; - if ((err = expand_fd_array(files, nr))) + if ((err = expand_fd_array(files, nr + 1))) goto out; } err = expand; @@ -737,6 +737,7 @@ do { \ add_wait_queue(&wq, &__wait); \ for (;;) { \ current->state = TASK_UNINTERRUPTIBLE; \ + mb(); \ if (condition) \ break; \ schedule(); \ @@ -760,6 +761,7 @@ do { \ add_wait_queue(&wq, &__wait); \ for (;;) { \ current->state = TASK_INTERRUPTIBLE; \ + mb(); \ if (condition) \ break; \ if (!signal_pending(current)) { \ |