summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-08 02:28:25 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-08 02:28:25 +0200
commit0dd7f883a9e21c5f2ff5e8f1cbb0e78cdc044d8a (patch)
tree080ba867394e0346b699ffe17973a76faa0e6920 /kernel
parentMerge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzi... (diff)
parent[kernel-doc] fix various DocBook build problems/warnings (diff)
downloadlinux-0dd7f883a9e21c5f2ff5e8f1cbb0e78cdc044d8a.tar.xz
linux-0dd7f883a9e21c5f2ff5e8f1cbb0e78cdc044d8a.zip
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.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 9508527845df..18b95520a2e2 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