diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-12 16:28:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-12 16:28:26 -0800 |
| commit | 1181a2449969c59f0ab6b95374fe6983cc07286d (patch) | |
| tree | cdbd320e6d2e0854ef8c699eb711d22e03275522 /arch | |
| parent | b743791639d8142277df1c2814c282e3ad752f06 (diff) | |
| parent | 9d0793370987b98708d2f75ee3bba7c1008d8512 (diff) | |
| download | op-kernel-dev-1181a2449969c59f0ab6b95374fe6983cc07286d.zip op-kernel-dev-1181a2449969c59f0ab6b95374fe6983cc07286d.tar.gz | |
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 b8a65b6..5bc0b8f 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, \ |
