diff options
author | Wolfram Sang <wsa@kernel.org> | 2020-05-20 16:27:45 +0300 |
---|---|---|
committer | Wolfram Sang <wsa@kernel.org> | 2020-05-20 16:27:45 +0300 |
commit | f89c326dcaa0cb8c3af7764e75eeed4e3f3c879a (patch) | |
tree | 31a5967da1f04180a1a922258f6947ad17255ee8 /include/uapi/linux/virtio_balloon.h | |
parent | 6fe12cdbcfe35ad4726a619a9546822d34fc934c (diff) | |
parent | efa7fb4c6c8e4171fd29a5935a9dc7a28e363278 (diff) | |
download | linux-f89c326dcaa0cb8c3af7764e75eeed4e3f3c879a.tar.xz |
Merge branch 'i2c/for-current-fixed' into i2c/for-5.8
Diffstat (limited to 'include/uapi/linux/virtio_balloon.h')
-rw-r--r-- | include/uapi/linux/virtio_balloon.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/uapi/linux/virtio_balloon.h b/include/uapi/linux/virtio_balloon.h index 19974392d324..dc3e656470dd 100644 --- a/include/uapi/linux/virtio_balloon.h +++ b/include/uapi/linux/virtio_balloon.h @@ -48,8 +48,15 @@ struct virtio_balloon_config { __u32 num_pages; /* Number of pages we've actually got in balloon. */ __u32 actual; - /* Free page report command id, readonly by guest */ - __u32 free_page_report_cmd_id; + /* + * Free page hint command id, readonly by guest. + * Was previously named free_page_report_cmd_id so we + * need to carry that name for legacy support. + */ + union { + __u32 free_page_hint_cmd_id; + __u32 free_page_report_cmd_id; /* deprecated */ + }; /* Stores PAGE_POISON if page poisoning is in use */ __u32 poison_val; }; |