diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-10 23:18:26 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-10 23:18:26 +0000 |
| commit | c7c4310f7fc1485925d800628bf50b3aeab535ef (patch) | |
| tree | b12aa4be0e8fb82aaaea97fb475e793e8a347c49 /include/linux/sched.h | |
| parent | 1ffd1d069ca4c5ffe16fea6175dab1b9bbb15820 (diff) | |
Merge with Linux 2.4.0-test3-pre8. Linus has accepted most of what
I've sent him, so we're very close to full integration of the MIPS
port into his sources.
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index d80ec061a..21c9f9f74 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -259,7 +259,6 @@ struct task_struct { struct exec_domain *exec_domain; volatile long need_resched; - cycles_t avg_slice; int lock_depth; /* Lock depth. We can context switch in and out of holding a syscall kernel lock... */ /* begin intel cache line */ long counter; @@ -267,8 +266,8 @@ struct task_struct { unsigned long policy; /* memory management info */ struct mm_struct *mm, *active_mm; - int has_cpu; - int processor; + int has_cpu, processor; + unsigned long cpus_allowed; unsigned long ptrace; struct list_head run_list; struct task_struct *next_task, *prev_task; @@ -399,6 +398,7 @@ struct task_struct { policy: SCHED_OTHER, \ mm: NULL, \ active_mm: &init_mm, \ + cpus_allowed: -1, \ run_list: LIST_HEAD_INIT(tsk.run_list), \ next_task: &tsk, \ prev_task: &tsk, \ |