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 /include/xen | |
| parent | fca0e39b2bd2fcfea2027845df28757943d9f561 (diff) | |
| parent | b3cf8528bb21febb650a7ecbf080d0647be40b9f (diff) | |
| download | lwn-9ad95bdacaa3296460fc23e31feaead1d4ffc8b9.tar.gz lwn-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 'include/xen')
| -rw-r--r-- | include/xen/balloon.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/xen/balloon.h b/include/xen/balloon.h index 4914b93a23f2..61f410fd74e4 100644 --- a/include/xen/balloon.h +++ b/include/xen/balloon.h @@ -44,3 +44,8 @@ static inline void xen_balloon_init(void) { } #endif + +#ifdef CONFIG_XEN_BALLOON_MEMORY_HOTPLUG +struct resource; +void arch_xen_balloon_init(struct resource *hostmem_resource); +#endif |