Merge branch 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

Conflicts:

	arch/x86/include/asm/topology.h
	drivers/oprofile/buffer_sync.c
(Both cases: changed in Linus' tree, removed in Ingo's).

diff --cc arch/x86/include/asm/topology.h
index 744299c,e3f4198..892b119
--- 1/arch/x86/include/asm/topology.h
--- 2/arch/x86/include/asm/topology.h
+++ b/arch/x86/include/asm/topology.h
@@@ -209,14 -172,14 +172,10 @@@ static inline int early_cpu_to_node(in
        return 0;
  }
  
- static inline const cpumask_t *cpumask_of_node(int node)
- {
-       return &cpu_online_map;
- }
- static inline cpumask_t node_to_cpumask(int node)
+ static inline const struct cpumask *cpumask_of_node(int node)
  {
-       return cpu_online_map;
+       return cpu_online_mask;
  }
 -static inline int node_to_first_cpu(int node)
 -{
 -      return cpumask_first(cpu_online_mask);
 -}
  
  static inline void setup_node_to_cpumask_map(void) { }
  
@@@ -233,7 -187,14 +183,6 @@@
  
  #include <asm-generic/topology.h>
  
- extern cpumask_t cpu_coregroup_map(int cpu);
 -#ifdef CONFIG_NUMA
 -/* Returns the number of the first CPU on Node 'node'. */
 -static inline int node_to_first_cpu(int node)
 -{
 -      return cpumask_first(cpumask_of_node(node));
 -}
 -#endif
 -
  extern const struct cpumask *cpu_coregroup_mask(int cpu);
  
  #ifdef ENABLE_TOPO_DEFINES

diff --cc arch/x86/kernel/apm_32.c
Simple merge

diff --cc drivers/pci/pci-driver.c
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge

diff --cc mm/slab.c
Simple merge

diff --cc mm/vmscan.c
index 479e467,1cdbf0b..f74a61e
--- 1/mm/vmscan.c
--- 2/mm/vmscan.c
+++ b/mm/vmscan.c
@@@ -1963,10 -1963,8 +1963,10 @@@ static int kswapd(void *p
        struct reclaim_state reclaim_state = {
                .reclaimed_slab = 0,
        };
-       node_to_cpumask_ptr(cpumask, pgdat->node_id);
+       const struct cpumask *cpumask = cpumask_of_node(pgdat->node_id);
  
 +      lockdep_set_current_reclaim_state(GFP_KERNEL);
 +
        if (!cpumask_empty(cpumask))
                set_cpus_allowed_ptr(tsk, cpumask);
        current->reclaim_state = &reclaim_state;

diff --cc net/sunrpc/svc.c
Simple merge