@@ -70,6 +70,8 @@ struct vdso_timestamp {
/**
* struct vdso_time_data - vdso datapage representation
+ * @arch_data: architecture specific data (optional, defaults
+ * to an empty struct)
* @seq: timebase sequence counter
* @clock_mode: clock mode
* @cycle_last: timebase at clocksource init
@@ -83,8 +85,6 @@ struct vdso_timestamp {
* @tz_dsttime: type of DST correction
* @hrtimer_res: hrtimer resolution
* @__unused: unused
- * @arch_data: architecture specific data (optional, defaults
- * to an empty struct)
*
* vdso_time_data will be accessed by 64 bit and compat code at the same time
* so we should be careful before modifying this structure.
@@ -105,6 +105,8 @@ struct vdso_timestamp {
* offset must be zero.
*/
struct vdso_time_data {
+ struct arch_vdso_time_data arch_data;
+
u32 seq;
s32 clock_mode;
@@ -125,8 +127,6 @@ struct vdso_time_data {
s32 tz_dsttime;
u32 hrtimer_res;
u32 __unused;
-
- struct arch_vdso_time_data arch_data;
} ____cacheline_aligned;
#define vdso_clock vdso_time_data