compile error in arch/ia64/kernel/acpi.c
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)
forgot to CC Tony Luck <[email protected]>
Quoted 6 lines · Li Zefan
arch/ia64/kernel/acpi.c:205: error: conflicting types for 'total_cpus'include/linux/smp.h:25: error: previous declaration of 'total_cpus' was heredue 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 <[email protected]>
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.
--- arch/ia64/kernel/acpi.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
arch/ia64/kernel/acpi.c +0 -1
@@ -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;
Signature · 1 line
1.5.4.rc3
Quoted 5 lines · 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 heredue 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.
arch/ia64/kernel/acpi.c +0 -1
@@ -202,7 +202,6 @@ char *__init __acpi_map_table(unsigned lBoot-time Table Parsing -------------------------------------------------------------------------- */ -static int total_cpus__initdata ;static int available_cpus__initdata ;struct acpi_table_madt *acpi_madt__initdata ;static u8 has_8259;
Kamalesh Babulal
Tested-byQuoted 9 lines · Rusty Russell
Quoted 5 lines · 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 heredue 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:
Hi Rusty,
This was caught in today's linux-next :)
Quoted 6 lines
Subject: Remove IA64 definition of
total_cpusnow it's in core codeImpact: fix IA64 compile
Fortunately, they have exactly the same semantics.
Quoted 13 lines
Signed-off-by Rusty Russell <[email protected]>arch/ia64/kernel/acpi.c +0
-1@@ -202,7 +202,6 @@ char *__init __acpi_map_table(unsigned lBoot-time Table Parsing -------------------------------------------------------------------------- */ -static int total_cpus__initdata ;static int available_cpus__initdata ;struct acpi_table_madt *acpi_madt__initdata ;static u8 has_8259;
Signature · 4 lines
Thanks & Regards, Kamalesh Babulal, Linux Technology Center, IBM, ISTL.