public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Li Zefan <lizf@cn.fujitsu.com>
To: Li Zefan <lizf@cn.fujitsu.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>,
	Mike Travis <travis@sgi.com>, Ingo Molnar <mingo@elte.hu>,
	LKML <linux-kernel@vger.kernel.org>,
	tony.luck@intel.com
Subject: Re: [-tip tree] compile error in arch/ia64/kernel/acpi.c
Date: Wed, 31 Dec 2008 17:25:38 +0800	[thread overview]
Message-ID: <495B3A92.6070900@cn.fujitsu.com> (raw)
In-Reply-To: <495B3857.90802@cn.fujitsu.com>

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



  reply	other threads:[~2008-12-31  9:26 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-12-31  9:16 [-tip tree] compile error in arch/ia64/kernel/acpi.c Li Zefan
2008-12-31  9:25 ` Li Zefan [this message]
2008-12-31 11:05 ` Rusty Russell
2008-12-31 15:15   ` Kamalesh Babulal

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=495B3A92.6070900@cn.fujitsu.com \
    --to=lizf@cn.fujitsu.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=rusty@rustcorp.com.au \
    --cc=tony.luck@intel.com \
    --cc=travis@sgi.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox