aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-03-04 12:23:28 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-03-04 12:23:28 -0500
commit87baa2bb904ed46f872385fe430b6cfb80967835 (patch)
tree36d9a0c365bfafe2a3c76b98a9b83b0d57809c9f /include
parent34f10fc9886450c2e8a336f7022805c4a73e10f1 (diff)
parent62fb185130e4d420f71a30ff59d8b16b74ef5d2b (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-devel: sched: revert load_balance_monitor() changes
Diffstat (limited to 'include')
-rw-r--r--include/linux/sched.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 2c9621f8bf87..9ae4030067a9 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1542,10 +1542,6 @@ extern unsigned int sysctl_sched_child_runs_first;
1542extern unsigned int sysctl_sched_features; 1542extern unsigned int sysctl_sched_features;
1543extern unsigned int sysctl_sched_migration_cost; 1543extern unsigned int sysctl_sched_migration_cost;
1544extern unsigned int sysctl_sched_nr_migrate; 1544extern unsigned int sysctl_sched_nr_migrate;
1545#if defined(CONFIG_FAIR_GROUP_SCHED) && defined(CONFIG_SMP)
1546extern unsigned int sysctl_sched_min_bal_int_shares;
1547extern unsigned int sysctl_sched_max_bal_int_shares;
1548#endif
1549 1545
1550int sched_nr_latency_handler(struct ctl_table *table, int write, 1546int sched_nr_latency_handler(struct ctl_table *table, int write,
1551 struct file *file, void __user *buffer, size_t *length, 1547 struct file *file, void __user *buffer, size_t *length,