[PATCH] efi is_memory_available ia64 hack build fix

[PATCH] efi is_memory_available ia64 hack build fix

[Paul Jackson]

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

Re: [PATCH] efi is_memory_available ia64 hack build fix

[Andrew Morton]

On Fri, 08 Dec 2006 02:33:36 -0800
Paul Jackson <pj@sgi.com> wrote:

> 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              

That already got named to is_memory_available()

(Which I suspect is the wrong fix, because the function serves the same
purpose on ia64 as it does on x86[_64], but nobody listens to me)

Re: [PATCH] efi is_memory_available ia64 hack build fix

[Paul Jackson]

Andrew wrote:
> That already got named to is_memory_available()

Ok - oh well.  Whatever.

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

Re: [PATCH] efi is_memory_available ia64 hack build fix

[Randy Dunlap]

On Fri, 8 Dec 2006 02:53:12 -0800 Andrew Morton wrote:

> On Fri, 08 Dec 2006 02:33:36 -0800
> Paul Jackson <pj@sgi.com> wrote:
> 
> > 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              
> 
> That already got named to is_memory_available()
> 
> (Which I suspect is the wrong fix, because the function serves the same
> purpose on ia64 as it does on x86[_64], but nobody listens to me)

Paul's patch looks better to me than renaming one of them.
And the predicate name on ia64 now seems confusing, at least to me.

And EFI for x86_64 is being worked on, so it will either
use arch/i386/kernel/efi.c or duplicate lots of it.

Summary:  There needs to be a place to share this and possibly other
common functions.

---
~Randy