diff options
Diffstat (limited to 'arch/x86/xen/setup.c')
| -rw-r--r-- | arch/x86/xen/setup.c | 6 | 
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index c114ca767b3b..6e0d2086eacb 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c @@ -808,7 +808,6 @@ char * __init xen_memory_setup(void)  	addr = xen_e820_table.entries[0].addr;  	size = xen_e820_table.entries[0].size;  	while (i < xen_e820_table.nr_entries) { -		bool discard = false;  		chunk_size = size;  		type = xen_e820_table.entries[i].type; @@ -824,11 +823,10 @@ char * __init xen_memory_setup(void)  				xen_add_extra_mem(pfn_s, n_pfns);  				xen_max_p2m_pfn = pfn_s + n_pfns;  			} else -				discard = true; +				type = E820_TYPE_UNUSABLE;  		} -		if (!discard) -			xen_align_and_add_e820_region(addr, chunk_size, type); +		xen_align_and_add_e820_region(addr, chunk_size, type);  		addr += chunk_size;  		size -= chunk_size;  |