diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-10-16 17:36:12 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-10-16 17:36:12 +0200 |
| commit | d0d27ef87e1ca974ed93ed4f7d3c123cbd392ba6 (patch) | |
| tree | f7c3e3259579973c896c634e2bdabed31a171395 /include/asm-generic/mshyperv.h | |
| parent | 1034cc423f1b4a7a9a56d310ca980fcd2753e11d (diff) | |
| parent | 58720809f52779dc0f08e53e54b014209d13eebb (diff) | |
| download | linux-next-d0d27ef87e1ca974ed93ed4f7d3c123cbd392ba6.tar.gz linux-next-d0d27ef87e1ca974ed93ed4f7d3c123cbd392ba6.zip | |
Merge 6.6-rc6 into usb-next
We need the USB and Thunderbolt fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/asm-generic/mshyperv.h')
| -rw-r--r-- | include/asm-generic/mshyperv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/mshyperv.h b/include/asm-generic/mshyperv.h index cecd2b7bd033..430f0ae0dde2 100644 --- a/include/asm-generic/mshyperv.h +++ b/include/asm-generic/mshyperv.h @@ -36,6 +36,7 @@ struct ms_hyperv_info { u32 nested_features; u32 max_vp_index; u32 max_lp_index; + u8 vtl; union { u32 isolation_config_a; struct { @@ -54,7 +55,6 @@ struct ms_hyperv_info { }; }; u64 shared_gpa_boundary; - u8 vtl; }; extern struct ms_hyperv_info ms_hyperv; extern bool hv_nested; |