From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Kiper Subject: [PATCH 2/7] xen: Rename e820_to_kexec_type() to xen_e820_to_kexec_type() and export it Date: Mon, 10 Sep 2012 13:57:46 +0200 Message-ID: <1347278271-5211-3-git-send-email-daniel.kiper@oracle.com> References: <1347278271-5211-1-git-send-email-daniel.kiper@oracle.com> <1347278271-5211-2-git-send-email-daniel.kiper@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1347278271-5211-2-git-send-email-daniel.kiper-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kexec-bounces-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org Errors-To: kexec-bounces+glkk-kexec=m.gmane.org-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org To: konrad.wilk-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org, andrew.cooper3-Sxgqhf6Nn4DQT0dZR+AlfA@public.gmane.org, olaf-QOLJcTWqO2uzQB+pC5nmwQ@public.gmane.org, jbeulich-IBi9RG/b67k@public.gmane.org, ptesarik-AlSwsSmVLrQ@public.gmane.org, kexec-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, xen-devel-GuqFBffKawuULHF6PoxzQEEOCMrvLtNR@public.gmane.org List-Id: xen-devel@lists.xenproject.org Rename e820_to_kexec_type() to xen_e820_to_kexec_type() and export it. Signed-off-by: Daniel Kiper --- kexec/arch/i386/kexec-x86-common.c | 6 +++--- 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 */ -- 1.5.6.5