diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-19 16:48:09 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-03-19 16:48:09 +0100 |
| commit | 0815d5cc7dfb4a2c6d02a6eb86974ab3992b803d (patch) | |
| tree | 2116699a753b2cef5951e29676cbfde423b44003 /arch/x86/platform | |
| parent | Merge tag 'dlm-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland... (diff) | |
| parent | xen/events: increment refcnt only if event channel is refcounted (diff) | |
| download | linux-0815d5cc7dfb4a2c6d02a6eb86974ab3992b803d.tar.xz linux-0815d5cc7dfb4a2c6d02a6eb86974ab3992b803d.zip | |
Merge tag 'for-linus-6.9-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen updates from Juergen Gross:
- Xen event channel handling fix for a regression with a rare kernel
config and some added hardening
- better support of running Xen dom0 in PVH mode
- a cleanup for the xen grant-dma-iommu driver
* tag 'for-linus-6.9-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen/events: increment refcnt only if event channel is refcounted
xen/evtchn: avoid WARN() when unbinding an event channel
x86/xen: attempt to inflate the memory balloon on PVH
xen/grant-dma-iommu: Convert to platform remove callback returning void
Diffstat (limited to 'arch/x86/platform')
| -rw-r--r-- | arch/x86/platform/pvh/enlighten.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/platform/pvh/enlighten.c b/arch/x86/platform/pvh/enlighten.c index 944e0290f2c0..8c2d4b8de25d 100644 --- a/arch/x86/platform/pvh/enlighten.c +++ b/arch/x86/platform/pvh/enlighten.c @@ -75,6 +75,9 @@ static void __init init_pvh_bootparams(bool xen_guest) } else xen_raw_printk("Warning: Can fit ISA range into e820\n"); + if (xen_guest) + xen_reserve_extra_memory(&pvh_bootparams); + pvh_bootparams.hdr.cmd_line_ptr = pvh_start_info.cmdline_paddr; |