linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [Patch] x86_64: use cpumask_t instead of unsigned long
@ 2005-01-14 21:39 Siddha, Suresh B
  2005-01-15  0:09 ` Andi Kleen
  0 siblings, 1 reply; 2+ messages in thread
From: Siddha, Suresh B @ 2005-01-14 21:39 UTC (permalink / raw)
  To: linux-kernel, akpm; +Cc: ak

Another cpumask_t related fix. Please apply.

thanks,
suresh
--

Use cpumask_t instead of unsigned long.

Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>


diff -Nru linux-2.6.10/arch/x86_64/kernel/mce.c linux-cpumask/arch/x86_64/kernel/mce.c
--- linux-2.6.10/arch/x86_64/kernel/mce.c	2004-12-24 13:34:30.000000000 -0800
+++ linux-cpumask/arch/x86_64/kernel/mce.c	2005-01-14 13:21:37.536627920 -0800
@@ -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;
 
diff -Nru linux-2.6.10/arch/x86_64/kernel/setup64.c linux-cpumask/arch/x86_64/kernel/setup64.c
--- linux-2.6.10/arch/x86_64/kernel/setup64.c	2004-12-24 13:34:29.000000000 -0800
+++ linux-cpumask/arch/x86_64/kernel/setup64.c	2005-01-14 13:21:29.657825680 -0800
@@ -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);
diff -Nru linux-2.6.10/include/asm-x86_64/proto.h linux-cpumask/include/asm-x86_64/proto.h
--- linux-2.6.10/include/asm-x86_64/proto.h	2004-12-24 13:35:27.000000000 -0800
+++ linux-cpumask/include/asm-x86_64/proto.h	2005-01-14 13:21:32.499393696 -0800
@@ -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);

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [Patch] x86_64: use cpumask_t instead of unsigned long
  2005-01-14 21:39 [Patch] x86_64: use cpumask_t instead of unsigned long Siddha, Suresh B
@ 2005-01-15  0:09 ` Andi Kleen
  0 siblings, 0 replies; 2+ messages in thread
From: Andi Kleen @ 2005-01-15  0:09 UTC (permalink / raw)
  To: Siddha, Suresh B; +Cc: linux-kernel, akpm, ak

On Fri, Jan 14, 2005 at 01:39:13PM -0800, Siddha, Suresh B wrote:
> Another cpumask_t related fix. Please apply.

Thanks applied.
-Andi

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2005-01-15  0:09 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-01-14 21:39 [Patch] x86_64: use cpumask_t instead of unsigned long Siddha, Suresh B
2005-01-15  0:09 ` Andi Kleen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).