diff options
| author | Daniel Kiper <daniel.kiper@oracle.com> | 2012-09-10 13:57:46 +0200 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2012-09-18 10:09:45 +0900 |
| commit | af23f7d8105be89273ab709fccbd0fb5345af9df (patch) | |
| tree | d77a26b40a105341626321b6cd9f6b9e599433f1 | |
| parent | f0839230276d32a67b5a4a65e199c1937adb3643 (diff) | |
xen: Rename e820_to_kexec_type() to xen_e820_to_kexec_type() and export it
Rename e820_to_kexec_type() to xen_e820_to_kexec_type() and export it.
Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
| -rw-r--r-- | kexec/arch/i386/kexec-x86-common.c | 6 | ||||
| -rw-r--r-- | kexec/arch/i386/kexec-x86.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/kexec/arch/i386/kexec-x86-common.c b/kexec/arch/i386/kexec-x86-common.c index 609d35d..02471a8 100644 --- a/kexec/arch/i386/kexec-x86-common.c +++ b/kexec/arch/i386/kexec-x86-common.c @@ -151,7 +151,7 @@ static int get_memory_ranges_sysfs(struct memory_range **range, int *ranges) } #ifdef HAVE_LIBXENCTRL -static unsigned e820_to_kexec_type(uint32_t type) +unsigned xen_e820_to_kexec_type(uint32_t type) { switch (type) { case E820_RAM: @@ -213,7 +213,7 @@ static int get_memory_ranges_xen(struct memory_range **range, int *ranges) for (i = 0; i < rc; ++i) { memory_range[i].start = e820entries[i].addr; memory_range[i].end = e820entries[i].addr + e820entries[i].size; - memory_range[i].type = e820_to_kexec_type(e820entries[i].type); + memory_range[i].type = xen_e820_to_kexec_type(e820entries[i].type); } qsort(memory_range, rc, sizeof(struct memory_range), compare_ranges); @@ -289,7 +289,7 @@ static int get_memory_ranges_xen(struct memory_range **range, int *ranges) for (i = 0; i < xen_memory_map->nr_entries; ++i) { memory_range[i].start = e820entries[i].addr; memory_range[i].end = e820entries[i].addr + e820entries[i].size; - memory_range[i].type = e820_to_kexec_type(e820entries[i].type); + memory_range[i].type = xen_e820_to_kexec_type(e820entries[i].type); } qsort(memory_range, xen_memory_map->nr_entries, sizeof(struct memory_range), compare_ranges); diff --git a/kexec/arch/i386/kexec-x86.h b/kexec/arch/i386/kexec-x86.h index dfcc51d..5aa2a46 100644 --- a/kexec/arch/i386/kexec-x86.h +++ b/kexec/arch/i386/kexec-x86.h @@ -81,4 +81,6 @@ int nbi_probe(const char *buf, off_t len); int nbi_load(int argc, char **argv, const char *buf, off_t len, struct kexec_info *info); void nbi_usage(void); + +extern unsigned xen_e820_to_kexec_type(uint32_t type); #endif /* KEXEC_X86_H */ |