diff options
| author | Linus Torvalds | 2023-12-03 08:31:53 +0900 |
|---|---|---|
| committer | Linus Torvalds | 2023-12-03 08:31:53 +0900 |
| commit | deb4b9dd3b539c8331bbc0d64dff3b4fb57296ef (patch) | |
| tree | b1fd0ca66bf387c28253ef6b76734ea18c138d52 /drivers | |
| parent | 669fc83452d443cb48f03ce0ebc496562e1c2205 (diff) | |
| parent | 7f3da4b698bcc21a6df0e7f114af71d53a3e26ac (diff) | |
Merge tag 'for-linus-6.7a-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fixes from Juergen Gross:
- A fix for the Xen event driver setting the correct return value when
experiencing an allocation failure
- A fix for allocating space for a struct in the percpu area to not
cross page boundaries (this one is for x86, a similar one for Arm was
already in the pull request for rc3)
* tag 'for-linus-6.7a-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen/events: fix error code in xen_bind_pirq_msi_to_irq()
x86/xen: fix percpu vcpu_info allocation
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/xen/events/events_base.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c index f5edb9e27e3c..b8cfea7812d6 100644 --- a/drivers/xen/events/events_base.c +++ b/drivers/xen/events/events_base.c @@ -1110,8 +1110,10 @@ int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc, for (i = 0; i < nvec; i++) { info = xen_irq_init(irq + i); - if (!info) + if (!info) { + ret = -ENOMEM; goto error_irq; + } irq_set_chip_and_handler_name(irq + i, &xen_pirq_chip, handle_edge_irq, name); |