فهرست منبع

[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>
Christoph Lameter 18 سال پیش
والد
کامیت
66888a6e5f
1فایلهای تغییر یافته به همراه3 افزوده شده و 3 حذف شده
  1. 3 3
      arch/ia64/kernel/efi.c

+ 3 - 3
arch/ia64/kernel/efi.c

@@ -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)
 			}
 			}
 			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)
 			}
 			}
 			contig_high = GRANULEROUNDDOWN(contig_high);
 			contig_high = GRANULEROUNDDOWN(contig_high);
 		}
 		}
-		if (!is_available_memory(md))
+		if (!is_memory_available(md))
 			continue;
 			continue;
 
 
 		/*
 		/*