diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-07 08:04:54 -0600 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-07 08:04:54 -0600 |
| commit | cbee7c8b4485fb876895b82ddba19ae4e2e2d102 (patch) | |
| tree | 4f3fac5090b301f8561c6e3f3f356cc494fc5194 /include/xen/interface/io/tpmif.h | |
| parent | Merge tag 'for-linus-2020-03-07' of gitolite.kernel.org:pub/scm/linux/kernel/git/brauner/linux (diff) | |
| parent | xen/blkfront: fix ring info addressing (diff) | |
| download | wireguard-linux-cbee7c8b4485fb876895b82ddba19ae4e2e2d102.tar.xz wireguard-linux-cbee7c8b4485fb876895b82ddba19ae4e2e2d102.zip | |
Merge tag 'for-linus-5.6b-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fixes from Juergen Gross:
"Four fixes and a small cleanup patch:
- two fixes by Dongli Zhang fixing races in the xenbus driver
- two fixes by me fixing issues introduced in 5.6
- a small cleanup by Gustavo Silva replacing a zero-length array with
a flexible-array"
* tag 'for-linus-5.6b-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen/blkfront: fix ring info addressing
xen/xenbus: fix locking
xenbus: req->err should be updated before req->state
xenbus: req->body should be updated before req->state
xen: Replace zero-length array with flexible-array member
Diffstat (limited to 'include/xen/interface/io/tpmif.h')
| -rw-r--r-- | include/xen/interface/io/tpmif.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/xen/interface/io/tpmif.h b/include/xen/interface/io/tpmif.h index 28e7dcd75e82..f8aa8bac5196 100644 --- a/include/xen/interface/io/tpmif.h +++ b/include/xen/interface/io/tpmif.h @@ -46,7 +46,7 @@ struct vtpm_shared_page { uint8_t pad; uint8_t nr_extra_pages; /* extra pages for long packets; may be zero */ - uint32_t extra_pages[0]; /* grant IDs; length in nr_extra_pages */ + uint32_t extra_pages[]; /* grant IDs; length in nr_extra_pages */ }; #endif |