Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Fix reset hangs on Niagara systems.
  cpumask: use mm_cpumask() wrapper: sparc
  cpumask: remove dangerous CPU_MASK_ALL_PTR, &CPU_MASK_ALL.: sparc
  cpumask: remove the now-obsoleted pcibus_to_cpumask(): sparc
  cpumask: remove cpu_coregroup_map: sparc
  cpumask: prepare for iterators to only go to nr_cpu_ids/nr_cpumask_bits.: sparc
  cpumask: prepare for iterators to only go to nr_cpu_ids/nr_cpumask_bits.: sparc64
  cpumask: Use accessors code.: sparc64
  cpumask: Use accessors code: sparc
  cpumask: arch_send_call_function_ipi_mask: sparc
  cpumask: Use smp_call_function_many(): sparc64

diff --combined arch/sparc/include/asm/topology_64.h
index 2770f64fdc3b59edc23714d7afad0367d19ac822,39624abb6a48f0b23a75880cd4314b9796ec9de3..e5ea8d332421d1ad1441541c8e013d62d099e444
--- 1/arch/sparc/include/asm/topology_64.h
--- 2/arch/sparc/include/asm/topology_64.h
+++ b/arch/sparc/include/asm/topology_64.h
@@@ -28,6 -28,11 +28,6 @@@ static inline cpumask_t node_to_cpumask
  #define node_to_cpumask_ptr_next(v, node)     \
                           v = &(numa_cpumask_lookup_table[node])
  
 -static inline int node_to_first_cpu(int node)
 -{
 -      return cpumask_first(cpumask_of_node(node));
 -}
 -
  struct pci_bus;
  #ifdef CONFIG_PCI
  extern int pcibus_to_node(struct pci_bus *pbus);
@@@ -38,13 -43,9 +38,9 @@@ static inline int pcibus_to_node(struc
  }
  #endif
  
- #define pcibus_to_cpumask(bus)        \
-       (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 : \
+        cpu_all_mask : \
         cpumask_of_node(pcibus_to_node(bus)))
  
  #define SD_NODE_INIT (struct sched_domain) {          \
@@@ -84,7 -85,6 +80,6 @@@
  #define smt_capable()                         (sparc64_multi_core)
  #endif /* CONFIG_SMP */
  
- #define cpu_coregroup_map(cpu)                        (cpu_core_map[cpu])
  #define cpu_coregroup_mask(cpu)                       (&cpu_core_map[cpu])
  
  #endif /* _ASM_SPARC64_TOPOLOGY_H */