summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-01-15 10:52:00 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2021-01-15 10:52:00 -0800
commitdcda487c9c2e80ad177cdc34ae2068bbe5dada07 (patch)
tree02242f83736d9cdb3812dd82ea6ed7ac21a3cf4d /arch/arm
parent7aec71cd9c1f251ef17eae5f898c10133d49421d (diff)
parent3d7746bea92530e8695258a3cf3ddec7a135edd6 (diff)
downloadlinux-stable-dcda487c9c2e80ad177cdc34ae2068bbe5dada07.tar.gz
linux-stable-dcda487c9c2e80ad177cdc34ae2068bbe5dada07.tar.bz2
linux-stable-dcda487c9c2e80ad177cdc34ae2068bbe5dada07.zip
Merge tag 'for-linus-5.11-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fixes from Juergen Gross: - A series to fix a regression when running as a fully virtualized guest on an old Xen hypervisor not supporting PV interrupt callbacks for HVM guests. - A patch to add support to query Xen resource sizes (setting was possible already) from user mode. * tag 'for-linus-5.11-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip: x86/xen: Fix xen_hvm_smp_init() when vector callback not available x86/xen: Don't register Xen IPIs when they aren't going to be used x86/xen: Add xen_no_vector_callback option to test PCI INTX delivery xen: Set platform PCI device INTX affinity to CPU0 xen: Fix event channel callback via INTX/GSI xen/privcmd: allow fetching resource sizes
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/xen/enlighten.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c
index 60e901cd0de6..5a957a9a0984 100644
--- a/arch/arm/xen/enlighten.c
+++ b/arch/arm/xen/enlighten.c
@@ -371,7 +371,7 @@ static int __init xen_guest_init(void)
}
gnttab_init();
if (!xen_initial_domain())
- xenbus_probe(NULL);
+ xenbus_probe();
/*
* Making sure board specific code will not set up ops for