Messages in this thread Patch in this message | | | From | Rusty Russell <> | Subject | Re: [-tip tree] compile error in arch/ia64/kernel/acpi.c | Date | Wed, 31 Dec 2008 21:35:08 +1030 |
| |
On Wednesday 31 December 2008 19:46:07 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)
Hmm, I don't know how this escaped linux-next. But the fix is simple:
Subject: Remove IA64 definition of total_cpus now it's in core code
Impact: fix IA64 compile
Fortunately, they have exactly the same semantics.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c @@ -202,7 +202,6 @@ char *__init __acpi_map_table(unsigned l 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;
| |