diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-04 07:40:19 +0000 |
| commit | 33263fc5f9ac8e8cb2b22d06af3ce5ac1dd815e4 (patch) | |
| tree | 2d1b86a40bef0958a68cf1a2eafbeb0667a70543 /include/linux/sched.h | |
| parent | 216f5f51aa02f8b113aa620ebc14a9631a217a00 (diff) | |
Merge with Linux 2.3.32.
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 26ef161ec..d9a6b2e18 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -84,20 +84,20 @@ extern int last_pid; #define TASK_EXCLUSIVE 32 #define __set_task_state(tsk, state_value) \ - do { tsk->state = state_value; } while (0) + do { (tsk)->state = (state_value); } while (0) #ifdef __SMP__ #define set_task_state(tsk, state_value) \ - set_mb(tsk->state, state_value) + set_mb((tsk)->state, (state_value)) #else #define set_task_state(tsk, state_value) \ - __set_task_state(tsk, state_value) + __set_task_state((tsk), (state_value)) #endif #define __set_current_state(state_value) \ - do { current->state = state_value; } while (0) + do { current->state = (state_value); } while (0) #ifdef __SMP__ #define set_current_state(state_value) \ - set_mb(current->state, state_value) + set_mb(current->state, (state_value)) #else #define set_current_state(state_value) \ __set_current_state(state_value) @@ -498,6 +498,7 @@ extern unsigned long prof_shift; #define CURRENT_TIME (xtime.tv_sec) extern void FASTCALL(__wake_up(wait_queue_head_t *q, unsigned int mode)); +extern void FASTCALL(__wake_up_sync(wait_queue_head_t *q, unsigned int mode)); extern void FASTCALL(sleep_on(wait_queue_head_t *q)); extern long FASTCALL(sleep_on_timeout(wait_queue_head_t *q, signed long timeout)); @@ -507,9 +508,12 @@ extern long FASTCALL(interruptible_sleep_on_timeout(wait_queue_head_t *q, extern void FASTCALL(wake_up_process(struct task_struct * tsk)); #define wake_up(x) __wake_up((x),TASK_UNINTERRUPTIBLE | TASK_INTERRUPTIBLE) +#define wake_up_sync(x) __wake_up_sync((x),TASK_UNINTERRUPTIBLE | TASK_INTERRUPTIBLE) #define wake_up_interruptible(x) __wake_up((x),TASK_INTERRUPTIBLE) +#define wake_up_interruptible_sync(x) __wake_up_sync((x),TASK_INTERRUPTIBLE) extern int in_group_p(gid_t); +extern int in_egroup_p(gid_t); extern void release(struct task_struct * p); @@ -847,7 +851,7 @@ static inline int task_lock(struct task_struct *p) down(&p->exit_sem); if (p->p_pptr) return 1; - /* He's dead, Jim. You take his wallet, I'll take tricoder... */ + /* He's dead, Jim. You take his wallet, I'll take the tricorder... */ up(&p->exit_sem); return 0; } |