diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-20 13:57:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-20 13:57:40 -0400 |
| commit | 1eb51c33b21ffa3fceb634d1d6bcd6488c79bc26 (patch) | |
| tree | 5360e0b439b35a97313ea8250209e7dacff8b9a6 /kernel/sched.c | |
| parent | b0b7065b64fe517b4a50915a1555e8ee98890d64 (diff) | |
| parent | 3104bf03a923c72043a9c5009d9cd56724304916 (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: Fix out of scope variable access in sched_slice()
sched: Hide runqueues from direct refer at source code level
sched: Remove unneeded __ref tag
sched, x86: Fix cpufreq + sched_clock() TSC scaling
Diffstat (limited to 'kernel/sched.c')
| -rw-r--r-- | kernel/sched.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 247fd0fedd0b..92e51287b980 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
| @@ -7822,7 +7822,7 @@ static void rq_attach_root(struct rq *rq, struct root_domain *rd) | |||
| 7822 | free_rootdomain(old_rd); | 7822 | free_rootdomain(old_rd); |
| 7823 | } | 7823 | } |
| 7824 | 7824 | ||
| 7825 | static int __init_refok init_rootdomain(struct root_domain *rd, bool bootmem) | 7825 | static int init_rootdomain(struct root_domain *rd, bool bootmem) |
| 7826 | { | 7826 | { |
| 7827 | gfp_t gfp = GFP_KERNEL; | 7827 | gfp_t gfp = GFP_KERNEL; |
| 7828 | 7828 | ||