summaryrefslogtreecommitdiffstats
path: root/Documentation/ABI/stable/sysfs-devices-system-xen_memory
diff options
context:
space:
mode:
authorGreg Kroah-Hartman2018-09-16 22:04:13 +0200
committerGreg Kroah-Hartman2018-09-16 22:04:13 +0200
commit7dc074348eb85d48f7a1fa96879458f4becf68a7 (patch)
treeaf626c941574ea68f7d74da04d81e302fbc14a68 /Documentation/ABI/stable/sysfs-devices-system-xen_memory
parentMAINTAINERS: remove myself as staging FBTFT maintainer (diff)
parentLinux 4.19-rc4 (diff)
downloadkernel-qcow2-linux-7dc074348eb85d48f7a1fa96879458f4becf68a7.tar.gz
kernel-qcow2-linux-7dc074348eb85d48f7a1fa96879458f4becf68a7.tar.xz
kernel-qcow2-linux-7dc074348eb85d48f7a1fa96879458f4becf68a7.zip
Merge 4.19-rc4 into staging-next
Handle the merge issues and take the iio and staging driver fixes. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/ABI/stable/sysfs-devices-system-xen_memory')
-rw-r--r--Documentation/ABI/stable/sysfs-devices-system-xen_memory9
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/ABI/stable/sysfs-devices-system-xen_memory b/Documentation/ABI/stable/sysfs-devices-system-xen_memory
index caa311d59ac1..6d83f95a8a8e 100644
--- a/Documentation/ABI/stable/sysfs-devices-system-xen_memory
+++ b/Documentation/ABI/stable/sysfs-devices-system-xen_memory
@@ -75,3 +75,12 @@ Contact: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Description:
Amount (in KiB) of low (or normal) memory in the
balloon.
+
+What: /sys/devices/system/xen_memory/xen_memory0/scrub_pages
+Date: September 2018
+KernelVersion: 4.20
+Contact: xen-devel@lists.xenproject.org
+Description:
+ Control scrubbing pages before returning them to Xen for others domains
+ use. Can be set with xen_scrub_pages cmdline
+ parameter. Default value controlled with CONFIG_XEN_SCRUB_PAGES_DEFAULT.