diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-04-01 22:17:41 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-01 22:17:41 -0400 |
| commit | c4361bb64b81f5b81a7a08d58654493385a2f2b2 (patch) | |
| tree | 8741c0b60ddfbc3fc4e17c8d200f6aa6ff32cca0 /arch/alpha/kernel/setup.c | |
| parent | 46368fa05164e1afdc1401294908cf30c6d8d981 (diff) | |
| parent | 833bb3046b6cb320e775ea2160ddca87d53260d5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/alpha/kernel/setup.c')
| -rw-r--r-- | arch/alpha/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c index 02bee6983ce2..80df86cd746b 100644 --- a/arch/alpha/kernel/setup.c +++ b/arch/alpha/kernel/setup.c | |||
| @@ -1255,7 +1255,7 @@ show_cpuinfo(struct seq_file *f, void *slot) | |||
| 1255 | platform_string(), nr_processors); | 1255 | platform_string(), nr_processors); |
| 1256 | 1256 | ||
| 1257 | #ifdef CONFIG_SMP | 1257 | #ifdef CONFIG_SMP |
| 1258 | seq_printf(f, "cpus active\t\t: %d\n" | 1258 | seq_printf(f, "cpus active\t\t: %u\n" |
| 1259 | "cpu active mask\t\t: %016lx\n", | 1259 | "cpu active mask\t\t: %016lx\n", |
| 1260 | num_online_cpus(), cpus_addr(cpu_possible_map)[0]); | 1260 | num_online_cpus(), cpus_addr(cpu_possible_map)[0]); |
| 1261 | #endif | 1261 | #endif |