diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 20:28:25 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 20:28:25 -0400 |
| commit | 0dd7f883a9e21c5f2ff5e8f1cbb0e78cdc044d8a (patch) | |
| tree | 080ba867394e0346b699ffe17973a76faa0e6920 /kernel | |
| parent | cc896f08717c445235554a7963a7b2ecf58911ad (diff) | |
| parent | 344babaa9d39b10b85cadec4e5335d43b52b4ec0 (diff) | |
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 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) | |||
| 1478 | 1478 | ||
| 1479 | /** | 1479 | /** |
| 1480 | * finish_task_switch - clean up after a task-switch | 1480 | * finish_task_switch - clean up after a task-switch |
| 1481 | * @rq: runqueue associated with task-switch | ||
| 1481 | * @prev: the thread we just switched away from. | 1482 | * @prev: the thread we just switched away from. |
| 1482 | * | 1483 | * |
| 1483 | * finish_task_switch must be called after the context switch, paired | 1484 | * finish_task_switch must be called after the context switch, paired |