diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-11 18:51:40 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-11 18:51:40 -0400 |
commit | 357d596bd552ad157a906289ab13ea6ba7e66e3d (patch) | |
tree | 78b8f6bc2781af2e95a6cf2b20a06dfe8bb04e5c /include/linux | |
parent | e6c69bd39199656a8bbd0569edaff60574ff9cac (diff) | |
parent | d67eb16f5d444fb6d173bcec889ddb2066c0fa0c (diff) |
Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/sched.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 4b83cb230006..ed3bb19d1337 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -904,6 +904,8 @@ extern int task_curr(const task_t *p); | |||
904 | extern int idle_cpu(int cpu); | 904 | extern int idle_cpu(int cpu); |
905 | extern int sched_setscheduler(struct task_struct *, int, struct sched_param *); | 905 | extern int sched_setscheduler(struct task_struct *, int, struct sched_param *); |
906 | extern task_t *idle_task(int cpu); | 906 | extern task_t *idle_task(int cpu); |
907 | extern task_t *curr_task(int cpu); | ||
908 | extern void set_curr_task(int cpu, task_t *p); | ||
907 | 909 | ||
908 | void yield(void); | 910 | void yield(void); |
909 | 911 | ||