diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-13 14:25:51 +0300 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-13 14:25:51 +0300 |
| commit | 968ea6d80e395cf11a51143cfa1b9a14ada676df (patch) | |
| tree | dc2acec8c9bdced33afe1e273ee5e0b0b93d2703 /kernel/sched_stats.h | |
| parent | 7be7585393d311866653564fbcd10a3232773c0b (diff) | |
| parent | 8299608f140ae321e4eb5d1306184265d2b9511e (diff) | |
| download | linux-968ea6d80e395cf11a51143cfa1b9a14ada676df.tar.xz | |
Merge ../linux-2.6-x86
Conflicts:
arch/x86/kernel/io_apic.c
kernel/sched.c
kernel/sched_stats.h
Diffstat (limited to 'kernel/sched_stats.h')
| -rw-r--r-- | kernel/sched_stats.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/sched_stats.h b/kernel/sched_stats.h index 6beff1e4eeae..5fcf0e184586 100644 --- a/kernel/sched_stats.h +++ b/kernel/sched_stats.h @@ -42,7 +42,8 @@ static int show_schedstat(struct seq_file *seq, void *v) for_each_domain(cpu, sd) { enum cpu_idle_type itype; - cpumask_scnprintf(mask_str, mask_len, &sd->span); + cpumask_scnprintf(mask_str, mask_len, + sched_domain_span(sd)); seq_printf(seq, "domain%d %s", dcount++, mask_str); for (itype = CPU_IDLE; itype < CPU_MAX_IDLE_TYPES; itype++) { |