public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Paul Jackson <pj@sgi.com>
To: Andrew Morton <akpm@osdl.org>, linux-kernel@vger.kernel.org
Cc: davej@codemonkey.org.uk, "Myaskouvskey,
	Artiom" <artiom.myaskouvskey@intel.com>,
	Randy Dunlap <randy.dunlap@oracle.com>,
	shai.satt@intel.com, Andi Kleen <ak@suse.de>,
	hpa@zytor.com, Paul Jackson <pj@sgi.com>
Subject: [PATCH] efi is_memory_available ia64 hack build fix
Date: Fri, 08 Dec 2006 02:33:36 -0800	[thread overview]
Message-ID: <20061208103336.4644.96389.sendpatchset@jackhammer.engr.sgi.com> (raw)

From: Paul Jackson <pj@sgi.com>

The addition of an is_available_memory() routine to some arch i386
code, along with an extern for it in efi.h, caused the ia64 build
to fail, which has the apparently identical routine, marked 'static'.

The ia64 build fails with:

arch/ia64/kernel/efi.c:229: error: static declaration of 'is_available_memory' follows non-static declaration
include/linux/efi.h:305: error: previous declaration of 'is_available_memory' was here              

Removing the static modifier from the ia64 definition of this
routine lets it build.

But it still doesn't seem right - as now we have two apparently
identical copies of is_available_memory() defined, in:

  arch/i386/kernel/efi.c
  arch/ia64/kernel/efi.c

However, I don't know what to do about that.
At least the build gets past this point now.

Signed-off-by: Paul Jackson <pj@sgi.com>

---

 arch/ia64/kernel/efi.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- 2.6.19-rc6-mm2.orig/arch/ia64/kernel/efi.c	2006-12-08 02:05:57.190745630 -0800
+++ 2.6.19-rc6-mm2/arch/ia64/kernel/efi.c	2006-12-08 02:07:38.256082124 -0800
@@ -224,7 +224,7 @@ efi_gettimeofday (struct timespec *ts)
 	ts->tv_nsec = tm.nanosecond;
 }
 
-static int
+int
 is_available_memory (efi_memory_desc_t *md)
 {
 	if (!(md->attribute & EFI_MEMORY_WB))

-- 
                          I won't rest till it's the best ...
                          Programmer, Linux Scalability
                          Paul Jackson <pj@sgi.com> 1.650.933.1373

             reply	other threads:[~2006-12-08 10:33 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-12-08 10:33 Paul Jackson [this message]
2006-12-08 10:53 ` [PATCH] efi is_memory_available ia64 hack build fix Andrew Morton
2006-12-08 10:57   ` Paul Jackson
2006-12-08 19:12   ` Randy Dunlap

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=20061208103336.4644.96389.sendpatchset@jackhammer.engr.sgi.com \
    --to=pj@sgi.com \
    --cc=ak@suse.de \
    --cc=akpm@osdl.org \
    --cc=artiom.myaskouvskey@intel.com \
    --cc=davej@codemonkey.org.uk \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=randy.dunlap@oracle.com \
    --cc=shai.satt@intel.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