diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-13 01:28:26 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-13 01:28:26 +0100 |
| commit | 1181a2449969c59f0ab6b95374fe6983cc07286d (patch) | |
| tree | cdbd320e6d2e0854ef8c699eb711d22e03275522 /arch | |
| parent | Merge branch 'for-next' of git://git.o-hand.com/linux-mfd (diff) | |
| parent | sparc64: Fix cpumask related build failure (diff) | |
| download | linux-1181a2449969c59f0ab6b95374fe6983cc07286d.tar.xz linux-1181a2449969c59f0ab6b95374fe6983cc07286d.zip | |
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sparc64: Fix cpumask related build failure
smp_call_function_single(): be slightly less stupid, fix
smp_call_function_single(): be slightly less stupid
rcu: fix bug in rcutorture system-shutdown code
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/sparc/include/asm/topology_64.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/topology_64.h b/arch/sparc/include/asm/topology_64.h index b8a65b64e1df..5bc0b8fd6374 100644 --- a/arch/sparc/include/asm/topology_64.h +++ b/arch/sparc/include/asm/topology_64.h @@ -47,6 +47,10 @@ static inline int pcibus_to_node(struct pci_bus *pbus) (pcibus_to_node(bus) == -1 ? \ CPU_MASK_ALL : \ node_to_cpumask(pcibus_to_node(bus))) +#define cpumask_of_pcibus(bus) \ + (pcibus_to_node(bus) == -1 ? \ + CPU_MASK_ALL_PTR : \ + cpumask_of_node(pcibus_to_node(bus))) #define SD_NODE_INIT (struct sched_domain) { \ .min_interval = 8, \ |