Commit a57cfbbf authored by Suresh B. Siddha's avatar Suresh B. Siddha Committed by Linus Torvalds

[PATCH] x86_64: use cpumask_t instead of unsigned long

Another cpumask_t related fix: use cpumask_t instead of unsigned long.
Signed-off-by: default avatarSuresh Siddha <suresh.b.siddha@intel.com>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a87732f3
......@@ -340,12 +340,12 @@ static void __init mce_cpu_features(struct cpuinfo_x86 *c)
*/
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;
......
......@@ -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;
......@@ -187,7 +187,7 @@ void __init cpu_init (void)
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);
......
......@@ -52,7 +52,7 @@ extern void load_gs_index(unsigned gs);
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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment