diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-25 20:59:38 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-25 20:59:38 -0400 |
| commit | 8dd90265ac0754da0df47d9c597f25187bb1c947 (patch) | |
| tree | 76b3e83a9417ae8eaf959f9a6306c3da446763b8 /include | |
| parent | 2a20b02c055a14eb60ac8da737d79dc940bb9ee0 (diff) | |
| parent | 1232d6132a986125f6a687ab9b61a4330e319270 (diff) | |
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched, doc: Update sched-design-CFS.txt
sched: Remove unused 'rq' variable and cpu_rq() call from alloc_fair_sched_group()
sched.h: Fix a typo ("its")
sched: Fix yield_to kernel-doc
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/sched.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index b8369d522bf8..83bd2e2982fc 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -517,7 +517,7 @@ struct thread_group_cputimer { | |||
| 517 | struct autogroup; | 517 | struct autogroup; |
| 518 | 518 | ||
| 519 | /* | 519 | /* |
| 520 | * NOTE! "signal_struct" does not have it's own | 520 | * NOTE! "signal_struct" does not have its own |
| 521 | * locking, because a shared signal_struct always | 521 | * locking, because a shared signal_struct always |
| 522 | * implies a shared sighand_struct, so locking | 522 | * implies a shared sighand_struct, so locking |
| 523 | * sighand_struct is always a proper superset of | 523 | * sighand_struct is always a proper superset of |