From: Rusty Russell <rusty@rustcorp.com.au>
Date: Tue, 31 Mar 2009 03:03:50 +0000 (+1030)
Subject: Merge branch 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.30-rc1~205^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=558f6ab9106e6be701acb0257e7171df1bbccf04;p=linux.git

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

Conflicts:

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

558f6ab9106e6be701acb0257e7171df1bbccf04
diff --cc arch/x86/include/asm/topology.h
index 744299c0b774,e3f4198371a9..892b119dba6f
--- a/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 mm/vmscan.c
index 479e46719394,1cdbf0b05727..f74a61e522f4
--- a/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;