[-tip tree] compile error in arch/ia64/kernel/acpi.c

[-tip tree] compile error in arch/ia64/kernel/acpi.c

[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 here

due to [PATCH 3/3] cpumask: add sysfs displays for configured and disabled cpu maps
(http://lkml.org/lkml/2008/12/19/25)

Re: [-tip tree] compile error in arch/ia64/kernel/acpi.c

[Li Zefan]

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

Re: [-tip tree] compile error in arch/ia64/kernel/acpi.c

[Rusty Russell]

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;

Re: [-tip tree] compile error in arch/ia64/kernel/acpi.c

[Kamalesh Babulal]

* Rusty Russell <rusty@rustcorp.com.au> [2008-12-31 21:35:08]:

> 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:
> 
Hi Rusty,

	This was caught in today's linux-next :)


> Subject: Remove IA64 definition of total_cpus now it's in core code
> 
> Impact: fix IA64 compile
> 
> Fortunately, they have exactly the same semantics.
> 
  Tested-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
> 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;

-- 
Thanks & Regards,
Kamalesh Babulal,
Linux Technology Center,
IBM, ISTL.