[PATCH] efi is_memory_available ia64 hack build fix

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]


From: Paul Jackson <[email protected]>

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:


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

Signed-off-by: Paul Jackson <[email protected]>


 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
 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 <[email protected]> 1.650.933.1373
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]
  Powered by Linux