All of lore.kernel.org
 help / color / mirror / Atom feed
From: Rusty Russell <rusty@rustcorp.com.au>
To: Li Zefan <lizf@cn.fujitsu.com>
Cc: Mike Travis <travis@sgi.com>, Ingo Molnar <mingo@elte.hu>,
	LKML <linux-kernel@vger.kernel.org>,
	Stephen Rothwell <sfr@canb.auug.org.au>,
	"Luck, Tony" <tony.luck@intel.com>
Subject: Re: [-tip tree] compile error in arch/ia64/kernel/acpi.c
Date: Wed, 31 Dec 2008 21:35:08 +1030	[thread overview]
Message-ID: <200812312135.09293.rusty@rustcorp.com.au> (raw)
In-Reply-To: <495B3857.90802@cn.fujitsu.com>

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;

  parent reply	other threads:[~2008-12-31 11:05 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
2008-12-31 11:05 ` Rusty Russell [this message]
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=200812312135.09293.rusty@rustcorp.com.au \
    --to=rusty@rustcorp.com.au \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lizf@cn.fujitsu.com \
    --cc=mingo@elte.hu \
    --cc=sfr@canb.auug.org.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.