aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Gross <jgross@suse.com>2018-08-20 09:02:03 -0400
committerBoris Ostrovsky <boris.ostrovsky@oracle.com>2018-08-20 14:46:18 -0400
commitdf11b6912f63ab86e694db5e9dee4df050f4c137 (patch)
tree429dd4957542a19de90446dd62accc7087f0faa2
parent166deb0f0bcdda70cfa650982777f94da273f0e4 (diff)
x86/xen: remove unused function xen_auto_xlated_memory_setup()
xen_auto_xlated_memory_setup() is a leftover from PVH V1. Remove it. Signed-off-by: Juergen Gross <jgross@suse.com> Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
-rw-r--r--arch/x86/xen/setup.c31
-rw-r--r--arch/x86/xen/xen-ops.h1
2 files changed, 0 insertions, 32 deletions
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
index 6e0d2086eacb..1163e33121fb 100644
--- a/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
@@ -906,37 +906,6 @@ char * __init xen_memory_setup(void)
906} 906}
907 907
908/* 908/*
909 * Machine specific memory setup for auto-translated guests.
910 */
911char * __init xen_auto_xlated_memory_setup(void)
912{
913 struct xen_memory_map memmap;
914 int i;
915 int rc;
916
917 memmap.nr_entries = ARRAY_SIZE(xen_e820_table.entries);
918 set_xen_guest_handle(memmap.buffer, xen_e820_table.entries);
919
920 rc = HYPERVISOR_memory_op(XENMEM_memory_map, &memmap);
921 if (rc < 0)
922 panic("No memory map (%d)\n", rc);
923
924 xen_e820_table.nr_entries = memmap.nr_entries;
925
926 e820__update_table(&xen_e820_table);
927
928 for (i = 0; i < xen_e820_table.nr_entries; i++)
929 e820__range_add(xen_e820_table.entries[i].addr, xen_e820_table.entries[i].size, xen_e820_table.entries[i].type);
930
931 /* Remove p2m info, it is not needed. */
932 xen_start_info->mfn_list = 0;
933 xen_start_info->first_p2m_pfn = 0;
934 xen_start_info->nr_p2m_frames = 0;
935
936 return "Xen";
937}
938
939/*
940 * Set the bit indicating "nosegneg" library variants should be used. 909 * Set the bit indicating "nosegneg" library variants should be used.
941 * We only need to bother in pure 32-bit mode; compat 32-bit processes 910 * We only need to bother in pure 32-bit mode; compat 32-bit processes
942 * can have un-truncated segments, so wrapping around is allowed. 911 * can have un-truncated segments, so wrapping around is allowed.
diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
index e78684597f57..0e60bd918695 100644
--- a/arch/x86/xen/xen-ops.h
+++ b/arch/x86/xen/xen-ops.h
@@ -50,7 +50,6 @@ void __init xen_inv_extra_mem(void);
50void __init xen_remap_memory(void); 50void __init xen_remap_memory(void);
51phys_addr_t __init xen_find_free_area(phys_addr_t size); 51phys_addr_t __init xen_find_free_area(phys_addr_t size);
52char * __init xen_memory_setup(void); 52char * __init xen_memory_setup(void);
53char * xen_auto_xlated_memory_setup(void);
54void __init xen_arch_setup(void); 53void __init xen_arch_setup(void);
55void xen_enable_sysenter(void); 54void xen_enable_sysenter(void);
56void xen_enable_syscall(void); 55void xen_enable_syscall(void);