Commit 66888a6e authored by Christoph Lameter's avatar Christoph Lameter Committed by Tony Luck

[IA64] resolve name clash by renaming is_available_memory()

There is a name clash with ia64 arch code in Andrew's tree. Rename
is_avialable_memory() to is_memory_available() to avoid the clash.
Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent a5f8ee02
...@@ -225,7 +225,7 @@ efi_gettimeofday (struct timespec *ts) ...@@ -225,7 +225,7 @@ efi_gettimeofday (struct timespec *ts)
} }
static int static int
is_available_memory (efi_memory_desc_t *md) is_memory_available (efi_memory_desc_t *md)
{ {
if (!(md->attribute & EFI_MEMORY_WB)) if (!(md->attribute & EFI_MEMORY_WB))
return 0; return 0;
...@@ -892,7 +892,7 @@ find_memmap_space (void) ...@@ -892,7 +892,7 @@ find_memmap_space (void)
} }
contig_high = GRANULEROUNDDOWN(contig_high); contig_high = GRANULEROUNDDOWN(contig_high);
} }
if (!is_available_memory(md) || md->type == EFI_LOADER_DATA) if (!is_memory_available(md) || md->type == EFI_LOADER_DATA)
continue; continue;
/* Round ends inward to granule boundaries */ /* Round ends inward to granule boundaries */
...@@ -968,7 +968,7 @@ efi_memmap_init(unsigned long *s, unsigned long *e) ...@@ -968,7 +968,7 @@ efi_memmap_init(unsigned long *s, unsigned long *e)
} }
contig_high = GRANULEROUNDDOWN(contig_high); contig_high = GRANULEROUNDDOWN(contig_high);
} }
if (!is_available_memory(md)) if (!is_memory_available(md))
continue; continue;
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment