git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'docs-move' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap...
[pandora-kernel.git]
/
arch
/
alpha
/
kernel
/
setup.c
diff --git
a/arch/alpha/kernel/setup.c
b/arch/alpha/kernel/setup.c
index
edbddcb
..
cc0fd86
100644
(file)
--- a/
arch/alpha/kernel/setup.c
+++ b/
arch/alpha/kernel/setup.c
@@
-1257,7
+1257,7
@@
show_cpuinfo(struct seq_file *f, void *slot)
#ifdef CONFIG_SMP
seq_printf(f, "cpus active\t\t: %u\n"
"cpu active mask\t\t: %016lx\n",
#ifdef CONFIG_SMP
seq_printf(f, "cpus active\t\t: %u\n"
"cpu active mask\t\t: %016lx\n",
- num_online_cpus(), cpu
s_addr(cpu_possible_map
)[0]);
+ num_online_cpus(), cpu
mask_bits(cpu_possible_mask
)[0]);
#endif
show_cache_size (f, "L1 Icache", alpha_l1i_cacheshape);
#endif
show_cache_size (f, "L1 Icache", alpha_l1i_cacheshape);