diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-09-15 01:01:06 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-09-15 01:01:06 +0200 |
| commit | d7c0268090e23f3517c7b7555d3f4f9d73580f96 (patch) | |
| tree | 4155224410495be015174712832c16e67843ffe4 /include | |
| parent | Merge tag 'xtensa-20180914' of git://github.com/jcmvbkbc/linux-xtensa (diff) | |
| parent | xen/gntdev: fix up blockable calls to mn_invl_range_start (diff) | |
| download | linux-d7c0268090e23f3517c7b7555d3f4f9d73580f96.tar.xz linux-d7c0268090e23f3517c7b7555d3f4f9d73580f96.zip | |
Merge tag 'for-linus-4.19c-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fixes from Juergen Gross:
"This contains some minor cleanups and fixes:
- a new knob for controlling scrubbing of pages returned by the Xen
balloon driver to the Xen hypervisor to address a boot performance
issue seen in large guests booted pre-ballooned
- a fix of a regression in the gntdev driver which made it impossible
to use fully virtualized guests (HVM guests) with a 4.19 based dom0
- a fix in Xen cpu hotplug functionality which could be triggered by
wrong admin commands (setting number of active vcpus to 0)
One further note: the patches have all been under test for several
days in another branch. This branch has been rebased in order to avoid
merge conflicts"
* tag 'for-linus-4.19c-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen/gntdev: fix up blockable calls to mn_invl_range_start
xen: fix GCC warning and remove duplicate EVTCHN_ROW/EVTCHN_COL usage
xen: avoid crash in disable_hotplug_cpu
xen/balloon: add runtime control for scrubbing ballooned out pages
xen/manage: don't complain about an empty value in control/sysrq node
Diffstat (limited to 'include')
| -rw-r--r-- | include/xen/mem-reservation.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/xen/mem-reservation.h b/include/xen/mem-reservation.h index 80b52b4945e9..a2ab516fcd2c 100644 --- a/include/xen/mem-reservation.h +++ b/include/xen/mem-reservation.h @@ -17,11 +17,12 @@ #include <xen/page.h> +extern bool xen_scrub_pages; + static inline void xenmem_reservation_scrub_page(struct page *page) { -#ifdef CONFIG_XEN_SCRUB_PAGES - clear_highpage(page); -#endif + if (xen_scrub_pages) + clear_highpage(page); } #ifdef CONFIG_XEN_HAVE_PVMMU |