diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-11-25 08:32:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-11-25 08:32:44 -0800 |
| commit | 00cff7b29b1dbc4ff48ae9278eb1aa4dc0bfad6a (patch) | |
| tree | 8def7e05c792cf1dffd8884edcae745ceacf13ee /drivers | |
| parent | 0f5cc96c367f2e780eb492cc9cab84e3b2ca88da (diff) | |
| parent | 7bf9a6b46549852a37e6d07e52c601c3c706b562 (diff) | |
| download | linux-stable-00cff7b29b1dbc4ff48ae9278eb1aa4dc0bfad6a.tar.gz linux-stable-00cff7b29b1dbc4ff48ae9278eb1aa4dc0bfad6a.tar.bz2 linux-stable-00cff7b29b1dbc4ff48ae9278eb1aa4dc0bfad6a.zip | |
Merge tag 'for-linus-6.7a-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fixes from Juergen Gross:
- A small cleanup patch for the Xen privcmd driver
- A fix for the swiotlb-xen driver which was missing the advertising of
the maximum mapping length
- A fix for Xen on Arm for a longstanding bug, which happened to occur
only recently: a structure in percpu memory crossed a page boundary,
which was rejected by the hypervisor
* tag 'for-linus-6.7a-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
arm/xen: fix xen_vcpu_info allocation alignment
xen: privcmd: Replace zero-length array with flex-array member and use __counted_by
swiotlb-xen: provide the "max_mapping_size" method
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/xen/privcmd.c | 2 | ||||
| -rw-r--r-- | drivers/xen/swiotlb-xen.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/xen/privcmd.c b/drivers/xen/privcmd.c index 1ce7f3c7a950..0eb337a8ec0f 100644 --- a/drivers/xen/privcmd.c +++ b/drivers/xen/privcmd.c @@ -1115,7 +1115,7 @@ struct privcmd_kernel_ioreq { spinlock_t lock; /* Protects ioeventfds list */ struct list_head ioeventfds; struct list_head list; - struct ioreq_port ports[0]; + struct ioreq_port ports[] __counted_by(vcpus); }; static irqreturn_t ioeventfd_interrupt(int irq, void *dev_id) diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c index 946bd56f0ac5..0e6c6c25d154 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -405,4 +405,5 @@ const struct dma_map_ops xen_swiotlb_dma_ops = { .get_sgtable = dma_common_get_sgtable, .alloc_pages = dma_common_alloc_pages, .free_pages = dma_common_free_pages, + .max_mapping_size = swiotlb_max_mapping_size, }; |