diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-17 13:41:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-01-17 13:41:38 -0800 |
| commit | 82fd5ee9d8a516d47a17e8c99c2712a3fd937014 (patch) | |
| tree | fea64bac0eb586c4059f60563fe60364aa11a104 /include | |
| parent | 09d1c6a80f2cf94c6e70be919203473d4ab8e26c (diff) | |
| parent | 2d2db7d40254d5fb53b11ebd703cd1ed0c5de7a1 (diff) | |
Merge tag 'for-linus-6.8-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen updates from Juergen Gross:
- update some Xen PV interface related headers
- fix some kernel-doc comments in the xenbus driver
- fix the Xen gntdev driver to not access the struct page of pages
imported from a DMA-buf
* tag 'for-linus-6.8-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen/gntdev: Fix the abuse of underlying struct page in DMA-buf import
xen/xenbus: client: fix kernel-doc comments
xen: update PV-device interface headers
Diffstat (limited to 'include')
| -rw-r--r-- | include/xen/interface/io/displif.h | 2 | ||||
| -rw-r--r-- | include/xen/interface/io/ring.h | 2 | ||||
| -rw-r--r-- | include/xen/interface/io/sndif.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/xen/interface/io/displif.h b/include/xen/interface/io/displif.h index 18417b017869..60e42d3b760e 100644 --- a/include/xen/interface/io/displif.h +++ b/include/xen/interface/io/displif.h @@ -537,7 +537,7 @@ struct xendispl_dbuf_create_req { struct xendispl_page_directory { grant_ref_t gref_dir_next_page; - grant_ref_t gref[1]; /* Variable length */ + grant_ref_t gref[]; }; /* diff --git a/include/xen/interface/io/ring.h b/include/xen/interface/io/ring.h index ba4c4274b714..4fef1efcdcab 100644 --- a/include/xen/interface/io/ring.h +++ b/include/xen/interface/io/ring.h @@ -95,7 +95,7 @@ struct __name##_sring { \ RING_IDX req_prod, req_event; \ RING_IDX rsp_prod, rsp_event; \ uint8_t __pad[48]; \ - union __name##_sring_entry ring[1]; /* variable-length */ \ + union __name##_sring_entry ring[]; \ }; \ \ /* "Front" end's private variables */ \ diff --git a/include/xen/interface/io/sndif.h b/include/xen/interface/io/sndif.h index 445657cdb1de..b818517588b5 100644 --- a/include/xen/interface/io/sndif.h +++ b/include/xen/interface/io/sndif.h @@ -659,7 +659,7 @@ struct xensnd_open_req { struct xensnd_page_directory { grant_ref_t gref_dir_next_page; - grant_ref_t gref[1]; /* Variable length */ + grant_ref_t gref[]; }; /* |