diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-28 11:17:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-07-28 11:17:30 -0700 |
| commit | 81eef8909d171bdca6af37028a11a24e011ed312 (patch) | |
| tree | daf29a77666fa7ba1876cf3cba5104002e96ab85 /drivers/xen/xenbus | |
| parent | e62e26d3e9ab89a0d40f94b237676b7e540d6d5c (diff) | |
| parent | c04e9894846c663f3278a414f34416e6e45bbe68 (diff) | |
| download | lwn-81eef8909d171bdca6af37028a11a24e011ed312.tar.gz lwn-81eef8909d171bdca6af37028a11a24e011ed312.zip | |
Merge tag 'for-linus-6.5a-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fixes from Juergen Gross:
- A fix for a performance problem in QubesOS, adding a way to drain the
queue of grants experiencing delayed unmaps faster
- A patch enabling the use of static event channels from user mode,
which was omitted when introducing supporting static event channels
- A fix for a problem where Xen related code didn't check properly for
running in a Xen environment, resulting in a WARN splat
* tag 'for-linus-6.5a-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen: speed up grant-table reclaim
xen/evtchn: Introduce new IOCTL to bind static evtchn
xenbus: check xen_domain in xenbus_probe_initcall
Diffstat (limited to 'drivers/xen/xenbus')
| -rw-r--r-- | drivers/xen/xenbus/xenbus_probe.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c index 58b732dcbfb8..639bf628389b 100644 --- a/drivers/xen/xenbus/xenbus_probe.c +++ b/drivers/xen/xenbus/xenbus_probe.c @@ -811,6 +811,9 @@ static int xenbus_probe_thread(void *unused) static int __init xenbus_probe_initcall(void) { + if (!xen_domain()) + return -ENODEV; + /* * Probe XenBus here in the XS_PV case, and also XS_HVM unless we * need to wait for the platform PCI device to come up or |