diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-15 10:52:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-01-15 10:52:00 -0800 |
| commit | dcda487c9c2e80ad177cdc34ae2068bbe5dada07 (patch) | |
| tree | 02242f83736d9cdb3812dd82ea6ed7ac21a3cf4d /include | |
| parent | 7aec71cd9c1f251ef17eae5f898c10133d49421d (diff) | |
| parent | 3d7746bea92530e8695258a3cf3ddec7a135edd6 (diff) | |
| download | linux-dcda487c9c2e80ad177cdc34ae2068bbe5dada07.tar.bz2 | |
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 'include')
| -rw-r--r-- | include/xen/xenbus.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/xen/xenbus.h b/include/xen/xenbus.h index 00c7235ae93e..2c43b0ef1e4d 100644 --- a/include/xen/xenbus.h +++ b/include/xen/xenbus.h @@ -192,7 +192,7 @@ void xs_suspend_cancel(void); struct work_struct; -void xenbus_probe(struct work_struct *); +void xenbus_probe(void); #define XENBUS_IS_ERR_READ(str) ({ \ if (!IS_ERR(str) && strlen(str) == 0) { \ |