diff options
| author | Suresh B. Siddha <suresh.b.siddha@intel.com> | 2005-01-14 23:24:52 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-14 23:24:52 -0800 |
| commit | a57cfbbf08e7c22ddbb5eda6334e335200e84a96 (patch) | |
| tree | 204e85e9d7576ce36942aea3c2994d192410aa91 /arch | |
| parent | a87732f39985c8bc44c42caa64ac97161ae4609e (diff) | |
| download | history-a57cfbbf08e7c22ddbb5eda6334e335200e84a96.tar.gz | |
[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: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86_64/kernel/mce.c | 4 | ||||
| -rw-r--r-- | arch/x86_64/kernel/setup64.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86_64/kernel/mce.c b/arch/x86_64/kernel/mce.c index b05d3b19278d5e..86f9fd85016a3c 100644 --- a/arch/x86_64/kernel/mce.c +++ b/arch/x86_64/kernel/mce.c @@ -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; diff --git a/arch/x86_64/kernel/setup64.c b/arch/x86_64/kernel/setup64.c index 2480983e7c827d..a7b25b948ed3fe 100644 --- a/arch/x86_64/kernel/setup64.c +++ b/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; @@ -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); |