diff options
| author | Christoph Lameter <clameter@sgi.com> | 2006-12-04 14:58:35 -0800 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2006-12-07 13:46:12 -0800 |
| commit | 66888a6e5ffc756b9a4115fc766ee2258eefb928 (patch) | |
| tree | c5cc1fb86896e77fa4634b22229a23179e94cd3e /arch/ia64 | |
| parent | a5f8ee0291e75f92a27111eb01da82be93c9068e (diff) | |
| download | linux-66888a6e5ffc756b9a4115fc766ee2258eefb928.tar.gz linux-66888a6e5ffc756b9a4115fc766ee2258eefb928.tar.bz2 linux-66888a6e5ffc756b9a4115fc766ee2258eefb928.zip | |
[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: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/kernel/efi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c index 9b96e7dbaf67..0b25a7d4e1e4 100644 --- a/arch/ia64/kernel/efi.c +++ b/arch/ia64/kernel/efi.c @@ -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; @@ -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 */ @@ -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; /* |