diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2010-06-01 03:57:49 -0400 |
|---|---|---|
| committer | Joerg Roedel <joerg.roedel@amd.com> | 2010-06-01 03:57:49 -0400 |
| commit | 1d61e73ab4c7470833241af888939a7aab2b0354 (patch) | |
| tree | dd714c2428070a7ea2bf807c2821ac75ff13ec55 /arch/x86/include/asm/pvclock-abi.h | |
| parent | 84fe6c19e4a598e8071e3bd1b2c923454eae1268 (diff) | |
| parent | 67a3e12b05e055c0415c556a315a3d3eb637e29e (diff) | |
Merge commit 'v2.6.35-rc1' into amd-iommu/2.6.35
Diffstat (limited to 'arch/x86/include/asm/pvclock-abi.h')
| -rw-r--r-- | arch/x86/include/asm/pvclock-abi.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/include/asm/pvclock-abi.h b/arch/x86/include/asm/pvclock-abi.h index 6d93508f2626..35f2d1948ada 100644 --- a/arch/x86/include/asm/pvclock-abi.h +++ b/arch/x86/include/asm/pvclock-abi.h | |||
| @@ -29,7 +29,8 @@ struct pvclock_vcpu_time_info { | |||
| 29 | u64 system_time; | 29 | u64 system_time; |
| 30 | u32 tsc_to_system_mul; | 30 | u32 tsc_to_system_mul; |
| 31 | s8 tsc_shift; | 31 | s8 tsc_shift; |
| 32 | u8 pad[3]; | 32 | u8 flags; |
| 33 | u8 pad[2]; | ||
| 33 | } __attribute__((__packed__)); /* 32 bytes */ | 34 | } __attribute__((__packed__)); /* 32 bytes */ |
| 34 | 35 | ||
| 35 | struct pvclock_wall_clock { | 36 | struct pvclock_wall_clock { |
| @@ -38,5 +39,6 @@ struct pvclock_wall_clock { | |||
| 38 | u32 nsec; | 39 | u32 nsec; |
| 39 | } __attribute__((__packed__)); | 40 | } __attribute__((__packed__)); |
| 40 | 41 | ||
| 42 | #define PVCLOCK_TSC_STABLE_BIT (1 << 0) | ||
| 41 | #endif /* __ASSEMBLY__ */ | 43 | #endif /* __ASSEMBLY__ */ |
| 42 | #endif /* _ASM_X86_PVCLOCK_ABI_H */ | 44 | #endif /* _ASM_X86_PVCLOCK_ABI_H */ |