diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 00:28:25 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 00:28:25 (GMT) |
commit | 0dd7f883a9e21c5f2ff5e8f1cbb0e78cdc044d8a (patch) | |
tree | 080ba867394e0346b699ffe17973a76faa0e6920 /kernel | |
parent | cc896f08717c445235554a7963a7b2ecf58911ad (diff) | |
parent | 344babaa9d39b10b85cadec4e5335d43b52b4ec0 (diff) | |
download | linux-fsl-qoriq-0dd7f883a9e21c5f2ff5e8f1cbb0e78cdc044d8a.tar.xz |
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/sched.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 9508527..18b9552 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -1478,6 +1478,7 @@ static inline void prepare_task_switch(runqueue_t *rq, task_t *next) /** * finish_task_switch - clean up after a task-switch + * @rq: runqueue associated with task-switch * @prev: the thread we just switched away from. * * finish_task_switch must be called after the context switch, paired |