Messages in this thread Patch in this message | | | Date | Wed, 31 Dec 2008 17:25:38 +0800 | From | Li Zefan <> | Subject | Re: [-tip tree] compile error in arch/ia64/kernel/acpi.c |
| |
forgot to CC Tony Luck <tony.luck@intel.com>
Li Zefan wrote: > arch/ia64/kernel/acpi.c:205: error: conflicting types for 'total_cpus' > include/linux/smp.h:25: error: previous declaration of 'total_cpus' was here > > due to [PATCH 3/3] cpumask: add sysfs displays for configured and disabled cpu maps > (http://lkml.org/lkml/2008/12/19/25) >
Is this a sane fix?
----
From: Li Zefan <lizf@cn.fujitsu.com> Subject: [PATCH] IA64: fix compile error
Remove static total_cpus in arch/ia64/kernel/acpi.c, use global total_cpus defined in drivers/base/cpu.c.
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> --- arch/ia64/kernel/acpi.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index 54ae373..0553648 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c @@ -202,7 +202,6 @@ char *__init __acpi_map_table(unsigned long phys_addr, unsigned long size) Boot-time Table Parsing -------------------------------------------------------------------------- */ -static int total_cpus __initdata; static int available_cpus __initdata; struct acpi_table_madt *acpi_madt __initdata; static u8 has_8259; -- 1.5.4.rc3
| |