diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-02-26 15:39:01 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-02-26 15:39:01 +0100 |
| commit | 134d1fd44221614d7de994d07ef92a6111952e1c (patch) | |
| tree | 5d6e5db31b5a9d2483388624820e6ca053d87cfa /arch/x86/include/uapi/asm/hyperv.h | |
| parent | USB: chaoskey: Use kasprintf() over strcpy()/strcat() (diff) | |
| parent | Linux 4.16-rc3 (diff) | |
| download | linux-134d1fd44221614d7de994d07ef92a6111952e1c.tar.xz linux-134d1fd44221614d7de994d07ef92a6111952e1c.zip | |
Merge 4.16-rc3 into usb-next
We want the USB fixes in here.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/include/uapi/asm/hyperv.h')
| -rw-r--r-- | arch/x86/include/uapi/asm/hyperv.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/x86/include/uapi/asm/hyperv.h b/arch/x86/include/uapi/asm/hyperv.h index 197c2e6c7376..099414345865 100644 --- a/arch/x86/include/uapi/asm/hyperv.h +++ b/arch/x86/include/uapi/asm/hyperv.h @@ -241,24 +241,24 @@ #define HV_X64_MSR_REENLIGHTENMENT_CONTROL 0x40000106 struct hv_reenlightenment_control { - u64 vector:8; - u64 reserved1:8; - u64 enabled:1; - u64 reserved2:15; - u64 target_vp:32; + __u64 vector:8; + __u64 reserved1:8; + __u64 enabled:1; + __u64 reserved2:15; + __u64 target_vp:32; }; #define HV_X64_MSR_TSC_EMULATION_CONTROL 0x40000107 #define HV_X64_MSR_TSC_EMULATION_STATUS 0x40000108 struct hv_tsc_emulation_control { - u64 enabled:1; - u64 reserved:63; + __u64 enabled:1; + __u64 reserved:63; }; struct hv_tsc_emulation_status { - u64 inprogress:1; - u64 reserved:63; + __u64 inprogress:1; + __u64 reserved:63; }; #define HV_X64_MSR_HYPERCALL_ENABLE 0x00000001 |