Skip to content

Commit

Permalink
[IA64] resolve name clash by renaming is_available_memory()
Browse files Browse the repository at this point in the history
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: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
  • Loading branch information
Christoph Lameter authored and Tony Luck committed Dec 7, 2006
1 parent a5f8ee0 commit 66888a6
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions arch/ia64/kernel/efi.c
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ efi_gettimeofday (struct timespec *ts)
}

static int
is_available_memory (efi_memory_desc_t *md)
is_memory_available (efi_memory_desc_t *md)
{
if (!(md->attribute & EFI_MEMORY_WB))
return 0;
Expand Down Expand Up @@ -892,7 +892,7 @@ find_memmap_space (void)
}
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;

/* Round ends inward to granule boundaries */
Expand Down Expand Up @@ -968,7 +968,7 @@ efi_memmap_init(unsigned long *s, unsigned long *e)
}
contig_high = GRANULEROUNDDOWN(contig_high);
}
if (!is_available_memory(md))
if (!is_memory_available(md))
continue;

/*
Expand Down

0 comments on commit 66888a6

Please sign in to comment.