aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sched/sched.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-09-04 08:31:00 -0400
committerIngo Molnar <mingo@kernel.org>2012-09-04 08:31:00 -0400
commit59f979455d7209171ab10a72c8df5c2512976cb4 (patch)
treec4c7fc48bd79bf8acbe848a1b979fa9e8ab4ac6a /kernel/sched/sched.h
parentb9bb50db9126c4ccad78af2dfb77277ca17c9b64 (diff)
parent9450d57eab5cad36774c297da123062744472588 (diff)
Merge branch 'sched/urgent' into sched/core
Merge in the current fixes branch, we are going to apply dependent patches. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched/sched.h')
-rw-r--r--kernel/sched/sched.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index 804c2e5e7872..09871698e80c 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h
@@ -1157,7 +1157,6 @@ extern void print_rt_stats(struct seq_file *m, int cpu);
1157 1157
1158extern void init_cfs_rq(struct cfs_rq *cfs_rq); 1158extern void init_cfs_rq(struct cfs_rq *cfs_rq);
1159extern void init_rt_rq(struct rt_rq *rt_rq, struct rq *rq); 1159extern void init_rt_rq(struct rt_rq *rt_rq, struct rq *rq);
1160extern void unthrottle_offline_cfs_rqs(struct rq *rq);
1161 1160
1162extern void account_cfs_bandwidth_used(int enabled, int was_enabled); 1161extern void account_cfs_bandwidth_used(int enabled, int was_enabled);
1163 1162