Skip to contentSkip to conversation

x86_64: use cpumask_t instead of unsigned long

PATCH Applied Siddha, Suresh B 2 participants 2 messages Jan 14, 2005 – Jan 15, 2005

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86_64: use cpumask_t instead of unsigned long

Another cpumask_t related fix. Please apply.

thanks,
suresh
--

Use cpumask_t instead of unsigned long.

arch/x86_64/kernel/mce.c +2 -2
diff -Nru linux-2.6.10/arch/x86_64/kernel/mce.c linux-cpumask/arch/x86_64/kernel/mce.c
@@ -311,12 +311,12 @@
  */
 void __init mcheck_init(struct cpuinfo_x86 *c)
 {
-	static unsigned long mce_cpus __initdata = 0;
+	static cpumask_t mce_cpus __initdata = CPU_MASK_NONE;
 
 	mce_cpu_quirks(c); 
 
 	if (mce_dont_init ||
-	    test_and_set_bit(smp_processor_id(), &mce_cpus) ||
+	    cpu_test_and_set(smp_processor_id(), mce_cpus) ||
 	    !mce_available(c))
 		return;
 
arch/x86_64/kernel/setup64.c +2 -2
diff -Nru linux-2.6.10/arch/x86_64/kernel/setup64.c linux-cpumask/arch/x86_64/kernel/setup64.c
@@ -28,7 +28,7 @@
 
 char x86_boot_params[2048] __initdata = {0,};
 
-unsigned long cpu_initialized __initdata = 0;
+cpumask_t cpu_initialized __initdata = CPU_MASK_NONE;
 
 struct x8664_pda cpu_pda[NR_CPUS] __cacheline_aligned; 
 
@@ -199,7 +199,7 @@
 
 	me = current;
 
-	if (test_and_set_bit(cpu, &cpu_initialized))
+	if (cpu_test_and_set(cpu, cpu_initialized))
 		panic("CPU#%d already initialized!\n", cpu);
 
 	printk("Initializing CPU#%d\n", cpu);
include/asm-x86_64/proto.h +1 -1
diff -Nru linux-2.6.10/include/asm-x86_64/proto.h linux-cpumask/include/asm-x86_64/proto.h
@@ -54,7 +54,7 @@
 
 extern unsigned long end_pfn_map; 
 
-extern unsigned long cpu_initialized;
+extern cpumask_t cpu_initialized;
 
 extern void show_trace(unsigned long * rsp);
 extern void show_registers(struct pt_regs *regs);
Applied
#1 lore raw
Quoted 1 line · Suresh B

Another cpumask_t related fix. Please apply.

Thanks applied.
-Andi