diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-22 12:30:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-22 12:30:10 -0800 |
| commit | 9ad95bdacaa3296460fc23e31feaead1d4ffc8b9 (patch) | |
| tree | a14e319a5c2abe31aa6542ecccf0f9e9545044ef /arch/x86/xen/setup.c | |
| parent | fca0e39b2bd2fcfea2027845df28757943d9f561 (diff) | |
| parent | b3cf8528bb21febb650a7ecbf080d0647be40b9f (diff) | |
| download | linux-9ad95bdacaa3296460fc23e31feaead1d4ffc8b9.tar.gz linux-9ad95bdacaa3296460fc23e31feaead1d4ffc8b9.tar.bz2 linux-9ad95bdacaa3296460fc23e31feaead1d4ffc8b9.zip | |
Merge tag 'for-linus-4.15-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fixes from Juergen Gross:
"This contains two fixes for running under Xen:
- a fix avoiding resource conflicts between adding mmio areas and
memory hotplug
- a fix setting NX bits in page table entries copied from Xen when
running a PV guest"
* tag 'for-linus-4.15-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen/balloon: Mark unallocated host memory as UNUSABLE
x86-64/Xen: eliminate W+X mappings
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; |