diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-08-20 07:53:08 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-08-20 07:53:08 -0400 |
| commit | e981b060767b3c4ac9393ad8d2558d648e35dfcb (patch) | |
| tree | 9c05eaec3072be3645dda61d35085d152b9d5954 /kernel/sched_debug.c | |
| parent | 3c955b407a084810f57260d61548cc92c14bc627 (diff) | |
| parent | da5cabf80e2433131bf0ed8993abc0f7ea618c73 (diff) | |
Merge commit 'v2.6.36-rc1' into kbuild/rc-fixes
Diffstat (limited to 'kernel/sched_debug.c')
| -rw-r--r-- | kernel/sched_debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched_debug.c b/kernel/sched_debug.c index 35565395d00d..2e1b0d17dd9b 100644 --- a/kernel/sched_debug.c +++ b/kernel/sched_debug.c | |||
| @@ -332,7 +332,7 @@ static int sched_debug_show(struct seq_file *m, void *v) | |||
| 332 | PN(sysctl_sched_latency); | 332 | PN(sysctl_sched_latency); |
| 333 | PN(sysctl_sched_min_granularity); | 333 | PN(sysctl_sched_min_granularity); |
| 334 | PN(sysctl_sched_wakeup_granularity); | 334 | PN(sysctl_sched_wakeup_granularity); |
| 335 | PN(sysctl_sched_child_runs_first); | 335 | P(sysctl_sched_child_runs_first); |
| 336 | P(sysctl_sched_features); | 336 | P(sysctl_sched_features); |
| 337 | #undef PN | 337 | #undef PN |
| 338 | #undef P | 338 | #undef P |