Merge remote-tracking branch 'asoc/topic/dmaengine' into asoc-next

[karo-tx-linux.git] / arch / x86 / include / asm / vgtod.h

diff --git a/arch/x86/include/asm/vgtod.h b/arch/x86/include/asm/vgtod.h
index 3a01996db58fbf7bfa41ca52c86f323d4bb6c937..022e5971456260e108981ce451ea23099558d6ce 100644 (file)
--- a/arch/x86/include/asm/vgtod.h
+++ b/arch/x86/include/asm/vgtod.h
@@ -17,8 +17,8 @@ struct vsyscall_gtod_data {
        unsigned seq;
 
        int vclock_mode;
-       cycle_t cycle_last;
-       cycle_t mask;
+       u64     cycle_last;
+       u64     mask;
        u32     mult;
        u32     shift;