diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-04 12:23:28 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-04 12:23:28 -0500 |
| commit | 87baa2bb904ed46f872385fe430b6cfb80967835 (patch) | |
| tree | 36d9a0c365bfafe2a3c76b98a9b83b0d57809c9f /include/linux | |
| parent | 34f10fc9886450c2e8a336f7022805c4a73e10f1 (diff) | |
| parent | 62fb185130e4d420f71a30ff59d8b16b74ef5d2b (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/linux')
| -rw-r--r-- | include/linux/sched.h | 4 |
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; | |||
| 1542 | extern unsigned int sysctl_sched_features; | 1542 | extern unsigned int sysctl_sched_features; |
| 1543 | extern unsigned int sysctl_sched_migration_cost; | 1543 | extern unsigned int sysctl_sched_migration_cost; |
| 1544 | extern unsigned int sysctl_sched_nr_migrate; | 1544 | extern unsigned int sysctl_sched_nr_migrate; |
| 1545 | #if defined(CONFIG_FAIR_GROUP_SCHED) && defined(CONFIG_SMP) | ||
| 1546 | extern unsigned int sysctl_sched_min_bal_int_shares; | ||
| 1547 | extern unsigned int sysctl_sched_max_bal_int_shares; | ||
| 1548 | #endif | ||
| 1549 | 1545 | ||
| 1550 | int sched_nr_latency_handler(struct ctl_table *table, int write, | 1546 | int 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, |