Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

iommufd 6.18 second rc pull 

Two compilation fixes, no functional change:
 
 - Fix a possible compiler error around counted_by() due to wrong initialization
   order
 
 - Fix a -Wflex-array-member-not-at-end
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYKAB0WIQRRRCHOFoQz/8F5bUaFwuHvBreFYQUCaSXE0AAKCRCFwuHvBreF
 YZ2/AQDPHtcqCNY9AfuoXFmnDiPoGoL4HVgNyvtm+nLVL6L9PgD/enaWlw/elQ5A
 rED5miPTjAA+gpsHCijCZz/u19qVLQk=
 =E6AS
 -----END PGP SIGNATURE-----

Merge tag 'for-linus-iommufd' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd

Pull iommufd fixes from Jason Gunthorpe:
 "Two build fixes, no functional change:

   - Fix a possible compiler error around counted_by() due to wrong
     initialization order

   - Fix a -Wflex-array-member-not-at-end"

* tag 'for-linus-iommufd' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd:
  iommufd/iommufd_private.h: Avoid -Wflex-array-member-not-at-end warning
  iommufd/driver: Fix counter initialization for counted_by annotation
This commit is contained in:
Linus Torvalds 2025-11-25 08:31:28 -08:00
parent 8a2bcda5e1 b07bf253ef
commit 5f8a6c70af
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/iommu/iommufd/driver.c
View File

@ -161,8 +161,8 @@ int iommufd_viommu_report_event(struct iommufd_viommu *viommu,
vevent = &veventq->lost_events_header; vevent = &veventq->lost_events_header;
goto out_set_header; goto out_set_header;
} }
memcpy(vevent->event_data, event_data, data_len);
vevent->data_len = data_len; vevent->data_len = data_len;
memcpy(vevent->event_data, event_data, data_len);
veventq->num_events++; veventq->num_events++;
out_set_header: out_set_header:

4
drivers/iommu/iommufd/iommufd_private.h
View File

@ -614,7 +614,6 @@ struct iommufd_veventq {
struct iommufd_eventq common; struct iommufd_eventq common;
struct iommufd_viommu *viommu; struct iommufd_viommu *viommu;
struct list_head node; /* for iommufd_viommu::veventqs */ struct list_head node; /* for iommufd_viommu::veventqs */
struct iommufd_vevent lost_events_header;
enum iommu_veventq_type type; enum iommu_veventq_type type;
unsigned int depth; unsigned int depth;
@ -622,6 +621,9 @@ struct iommufd_veventq {
/* Use common.lock for protection */ /* Use common.lock for protection */
u32 num_events; u32 num_events;
u32 sequence; u32 sequence;
/* Must be last as it ends in a flexible-array member. */
struct iommufd_vevent lost_events_header;
}; };
static inline struct iommufd_veventq * static inline struct iommufd_veventq *