Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6

2005-09-07 17:28:25 -07:00
parent cc896f0871 344babaa9d
commit 0dd7f883a9
5 changed files with 6 additions and 4 deletions
--- 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