aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/xen/setup.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/xen/setup.c')
-rw-r--r--arch/x86/xen/setup.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
index ac55c02f98e9..e9011e1ee3de 100644
--- a/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
@@ -807,7 +807,6 @@ char * __init xen_memory_setup(void)
807 addr = xen_e820_table.entries[0].addr; 807 addr = xen_e820_table.entries[0].addr;
808 size = xen_e820_table.entries[0].size; 808 size = xen_e820_table.entries[0].size;
809 while (i < xen_e820_table.nr_entries) { 809 while (i < xen_e820_table.nr_entries) {
810 bool discard = false;
811 810
812 chunk_size = size; 811 chunk_size = size;
813 type = xen_e820_table.entries[i].type; 812 type = xen_e820_table.entries[i].type;
@@ -823,11 +822,10 @@ char * __init xen_memory_setup(void)
823 xen_add_extra_mem(pfn_s, n_pfns); 822 xen_add_extra_mem(pfn_s, n_pfns);
824 xen_max_p2m_pfn = pfn_s + n_pfns; 823 xen_max_p2m_pfn = pfn_s + n_pfns;
825 } else 824 } else
826 discard = true; 825 type = E820_TYPE_UNUSABLE;
827 } 826 }
828 827
829 if (!discard) 828 xen_align_and_add_e820_region(addr, chunk_size, type);
830 xen_align_and_add_e820_region(addr, chunk_size, type);
831 829
832 addr += chunk_size; 830 addr += chunk_size;
833 size -= chunk_size; 831 size -= chunk_size;