summaryrefslogtreecommitdiff
path: root/Documentation/admin-guide
diff options
context:
space:
mode:
authorJoel Stanley <joel@jms.id.au>2021-11-26 02:12:27 +0300
committerJoel Stanley <joel@jms.id.au>2021-11-26 02:12:27 +0300
commitebd46c8290139e545fbb16201b2b26851a657baa (patch)
tree542d613c478f47bc0e9850a17ec32a18a953ccec /Documentation/admin-guide
parent58704e2943803ded612b42510874b63b518aa214 (diff)
parentf00712e27083550be3031099b7697925533a6e01 (diff)
downloadlinux-ebd46c8290139e545fbb16201b2b26851a657baa.tar.xz
Merge tag 'v5.15.5' into dev-5.15
This is the 5.15.5 stable release Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'Documentation/admin-guide')
-rw-r--r--Documentation/admin-guide/kernel-parameters.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 26d85aeaf2cb..6574e16c5c68 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -6352,6 +6352,13 @@
improve timer resolution at the expense of processing
more timer interrupts.
+ xen.balloon_boot_timeout= [XEN]
+ The time (in seconds) to wait before giving up to boot
+ in case initial ballooning fails to free enough memory.
+ Applies only when running as HVM or PVH guest and
+ started with less memory configured than allowed at
+ max. Default is 180.
+
xen.event_eoi_delay= [XEN]
How long to delay EOI handling in case of event
storms (jiffies). Default is 10.