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 'master' of /home/davem/src/GIT/linux-2.6/
[pandora-kernel.git]
/
arch
/
ia64
/
kernel
/
topology.c
diff --git
a/arch/ia64/kernel/topology.c
b/arch/ia64/kernel/topology.c
index
c75b914
..
a8d61a3
100644
(file)
--- a/
arch/ia64/kernel/topology.c
+++ b/
arch/ia64/kernel/topology.c
@@
-219,7
+219,7
@@
static ssize_t show_shared_cpu_map(struct cache_info *this_leaf, char *buf)
cpumask_t shared_cpu_map;
cpus_and(shared_cpu_map, this_leaf->shared_cpu_map, cpu_online_map);
cpumask_t shared_cpu_map;
cpus_and(shared_cpu_map, this_leaf->shared_cpu_map, cpu_online_map);
- len = cpumask_scnprintf(buf, NR_CPUS+1, shared_cpu_map);
+ len = cpumask_scnprintf(buf, NR_CPUS+1,
&
shared_cpu_map);
len += sprintf(buf+len, "\n");
return len;
}
len += sprintf(buf+len, "\n");
return len;
}