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 git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
arch
/
sh
/
include
/
asm
/
topology.h
diff --git
a/arch/sh/include/asm/topology.h
b/arch/sh/include/asm/topology.h
index
37cdadd
..
88e7340
100644
(file)
--- a/
arch/sh/include/asm/topology.h
+++ b/
arch/sh/include/asm/topology.h
@@
-35,7
+35,7
@@
#define pcibus_to_node(bus) ((void)(bus), -1)
#define cpumask_of_pcibus(bus) (pcibus_to_node(bus) == -1 ? \
-
CPU_MASK_ALL_PTR
: \
+
cpu_all_mask
: \
cpumask_of_node(pcibus_to_node(bus)))
#endif