diff --git a/[refs] b/[refs] index bf860162e74c..b120f5f841e8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 733371df3db375cb66280911162b9746b0436d68 +refs/heads/master: 25e2831dc459a45424f1dbdce7556d3ab5bc012d diff --git a/trunk/drivers/staging/hv/utils.h b/trunk/drivers/staging/hv/utils.h index ecbeab69a23f..a4b9fd06e270 100644 --- a/trunk/drivers/staging/hv/utils.h +++ b/trunk/drivers/staging/hv/utils.h @@ -77,26 +77,26 @@ struct shutdown_msg_data { /* Time Sync IC defs */ -#define ICTIMESYNCFLAG_PROBE 0 -#define ICTIMESYNCFLAG_SYNC 1 -#define ICTIMESYNCFLAG_SAMPLE 2 +#define ICTIMESYNCFLAG_PROBE 0 +#define ICTIMESYNCFLAG_SYNC 1 +#define ICTIMESYNCFLAG_SAMPLE 2 #ifdef __x86_64__ -#define WLTIMEDELTA 116444736000000000L /* in 100ns unit */ +#define WLTIMEDELTA 116444736000000000L /* in 100ns unit */ #else -#define WLTIMEDELTA 116444736000000000LL +#define WLTIMEDELTA 116444736000000000LL #endif struct ictimesync_data{ - u64 parenttime; - u64 childtime; - u64 roundtriptime; - u8 flags; + u64 parenttime; + u64 childtime; + u64 roundtriptime; + u8 flags; } __attribute__((packed)); /* Index for each IC struct in array hv_cb_utils[] */ -#define HV_SHUTDOWN_MSG 0 -#define HV_TIMESYNC_MSG 1 +#define HV_SHUTDOWN_MSG 0 +#define HV_TIMESYNC_MSG 1 struct hyperv_service_callback { u8 msg_type;