diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-30 21:00:26 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-30 21:00:26 -0400 |
commit | d17abcd5417d84cfa8a225160481203a37dc81d4 (patch) | |
tree | 74ce2c425c5c6550acec90bc92c8a3f735f0d257 /arch/sparc/include/asm/topology_64.h | |
parent | db6f204019380c788f1de06ee937bdbccd60e5c0 (diff) | |
parent | bb75efddeaca89f8a67fd82cdcbaaf436cf17ca9 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask:
oprofile: Thou shalt not call __exit functions from __init functions
cpumask: remove the now-obsoleted pcibus_to_cpumask(): generic
cpumask: remove cpumask_t from core
cpumask: convert rcutorture.c
cpumask: use new cpumask_ functions in core code.
cpumask: remove references to struct irqaction's mask field.
cpumask: use mm_cpumask() wrapper: kernel/fork.c
cpumask: use set_cpu_active in init/main.c
cpumask: remove node_to_first_cpu
cpumask: fix seq_bitmap_*() functions.
cpumask: remove dangerous CPU_MASK_ALL_PTR, &CPU_MASK_ALL
Diffstat (limited to 'arch/sparc/include/asm/topology_64.h')
-rw-r--r-- | arch/sparc/include/asm/topology_64.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/sparc/include/asm/topology_64.h b/arch/sparc/include/asm/topology_64.h index 5bc0b8fd6374..2770f64fdc3b 100644 --- a/arch/sparc/include/asm/topology_64.h +++ b/arch/sparc/include/asm/topology_64.h | |||
@@ -28,11 +28,6 @@ static inline cpumask_t node_to_cpumask(int node) | |||
28 | #define node_to_cpumask_ptr_next(v, node) \ | 28 | #define node_to_cpumask_ptr_next(v, node) \ |
29 | v = &(numa_cpumask_lookup_table[node]) | 29 | v = &(numa_cpumask_lookup_table[node]) |
30 | 30 | ||
31 | static inline int node_to_first_cpu(int node) | ||
32 | { | ||
33 | return cpumask_first(cpumask_of_node(node)); | ||
34 | } | ||
35 | |||
36 | struct pci_bus; | 31 | struct pci_bus; |
37 | #ifdef CONFIG_PCI | 32 | #ifdef CONFIG_PCI |
38 | extern int pcibus_to_node(struct pci_bus *pbus); | 33 | extern int pcibus_to_node(struct pci_bus *pbus); |