Signed-of-by: Mike Travis <travis@sgi.com>
---
 arch/x86/kernel/smp.c     |    6 +++---
 arch/x86/kernel/smpboot.c |   20 ++++++++++++--------
 include/asm-x86/smp.h     |    6 +++---
 include/linux/smp.h       |    8 ++++----
 kernel/smp.c              |   15 ++++++++-------
 5 files changed, 30 insertions(+), 25 deletions(-)

--- struct-cpumasks.orig/arch/x86/kernel/smp.c
+++ struct-cpumasks/arch/x86/kernel/smp.c
@@ -118,15 +118,15 @@ static void native_smp_send_reschedule(i
 		WARN_ON(1);
 		return;
 	}
-	send_IPI_mask(&cpumask_of_cpu(cpu), RESCHEDULE_VECTOR);
+	send_IPI_mask(cpumask_of_cpu(cpu), RESCHEDULE_VECTOR);
 }
 
 void native_send_call_func_single_ipi(int cpu)
 {
-	send_IPI_mask(&cpumask_of_cpu(cpu), CALL_FUNCTION_SINGLE_VECTOR);
+	send_IPI_mask(cpumask_of_cpu(cpu), CALL_FUNCTION_SINGLE_VECTOR);
 }
 
-void native_send_call_func_ipi(const cpumask_t *mask)
+void native_send_call_func_ipi(const_cpumask_t mask)
 {
 	int cpu = smp_processor_id();
 
--- struct-cpumasks.orig/arch/x86/kernel/smpboot.c
+++ struct-cpumasks/arch/x86/kernel/smpboot.c
@@ -466,7 +466,8 @@ void __cpuinit set_cpu_sibling_map(int c
 	cpu_set(cpu, c->llc_shared_map);
 
 	if (current_cpu_data.x86_max_cores == 1) {
-		per_cpu(cpu_core_map, cpu) = per_cpu(cpu_sibling_map, cpu);
+		cpus_copy(per_cpu(cpu_core_map, cpu),
+			  per_cpu(cpu_sibling_map, cpu));
 		c->booted_cores = 1;
 		return;
 	}
@@ -503,7 +504,7 @@ void __cpuinit set_cpu_sibling_map(int c
 }
 
 /* maps the cpu to the sched domain representing multi-core */
-const cpumask_t cpu_coregroup_map(int cpu)
+const_cpumask_t cpu_coregroup_map(int cpu)
 {
 	struct cpuinfo_x86 *c = &cpu_data(cpu);
 	/*
@@ -511,9 +512,9 @@ const cpumask_t cpu_coregroup_map(int cp
 	 * And for power savings, we return cpu_core_map
 	 */
 	if (sched_mc_power_savings || sched_smt_power_savings)
-		return (const cpumask_t)per_cpu(cpu_core_map, cpu);
+		return (const_cpumask_t)per_cpu(cpu_core_map, cpu);
 	else
-		return (const ...
[ message continues ]