diff options
| author | Daniel Kiper <dkiper@net-space.pl> | 2011-08-21 15:54:00 +0200 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2011-08-22 07:39:49 +0900 |
| commit | 82fde208abae2fd9177539df594cb110c713935d (patch) | |
| tree | 42627cfbd110bc18dc04bdc10e1de7005b834fd5 | |
| parent | f6929891145014dff22199d25c87ccd38256af2c (diff) | |
| download | kexec-tools-82fde208abae2fd9177539df594cb110c713935d.tar.gz | |
kexec/arch/i386: Rename fixup_memory_ranges_sysfs() to fixup_memory_ranges()
Rename fixup_memory_ranges_sysfs() to fixup_memory_ranges().
It is generic function and it could be used to fixup memory
ranges from other sources than sysfs (e.g. Xen).
Signed-off-by: Daniel Kiper <dkiper@net-space.pl>
Signed-off-by: Simon Horman <horms@verge.net.au>
| -rw-r--r-- | kexec/arch/i386/kexec-x86-common.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kexec/arch/i386/kexec-x86-common.c b/kexec/arch/i386/kexec-x86-common.c index 474e680e..8f59c6c2 100644 --- a/kexec/arch/i386/kexec-x86-common.c +++ b/kexec/arch/i386/kexec-x86-common.c @@ -149,7 +149,7 @@ static void remove_range(struct memory_range *range, int nr_ranges, int index) * * @return 0 on success, any other value on failure. */ -static int fixup_memory_ranges_sysfs(struct memory_range **range, int *ranges) +static int fixup_memory_ranges(struct memory_range **range, int *ranges) { int i; int j; @@ -162,7 +162,7 @@ again: for (i = 0; i < (nr_ranges-1); i++) { j = i+1; if (rp[i].start > rp[j].start) { - fprintf(stderr, "sysfs memory out of order!!\n"); + fprintf(stderr, "memory out of order!!\n"); return 1; } @@ -252,7 +252,7 @@ int get_memory_ranges(struct memory_range **range, int *ranges, if (!efi_map_added() && !xen_present() && have_sys_firmware_memmap()) { ret = get_memory_ranges_sysfs(range, ranges); if (!ret) - ret = fixup_memory_ranges_sysfs(range, ranges); + ret = fixup_memory_ranges(range, ranges); } else ret = get_memory_ranges_proc_iomem(range, ranges); |