diff options
| author | Thomas Gleixner | 2015-10-13 19:00:14 +0200 |
|---|---|---|
| committer | Thomas Gleixner | 2015-10-13 19:00:14 +0200 |
| commit | e50226b4b86755e65aef2129e94d952fee3df722 (patch) | |
| tree | d4dd925fc7f5c6fe46b647c8027911190595f014 /arch/x86/include/asm/pvclock-abi.h | |
| parent | genirq: Add flag to force mask in disable_irq[_nosync]() (diff) | |
| parent | Linux 4.3-rc5 (diff) | |
| download | kernel-qcow2-linux-e50226b4b86755e65aef2129e94d952fee3df722.tar.gz kernel-qcow2-linux-e50226b4b86755e65aef2129e94d952fee3df722.tar.xz kernel-qcow2-linux-e50226b4b86755e65aef2129e94d952fee3df722.zip | |
Merge branch 'linus' into irq/core
Bring in upstream updates for patches which depend on them
Diffstat (limited to 'arch/x86/include/asm/pvclock-abi.h')
| -rw-r--r-- | arch/x86/include/asm/pvclock-abi.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/pvclock-abi.h b/arch/x86/include/asm/pvclock-abi.h index 655e07a48f6c..67f08230103a 100644 --- a/arch/x86/include/asm/pvclock-abi.h +++ b/arch/x86/include/asm/pvclock-abi.h @@ -41,6 +41,7 @@ struct pvclock_wall_clock { #define PVCLOCK_TSC_STABLE_BIT (1 << 0) #define PVCLOCK_GUEST_STOPPED (1 << 1) +/* PVCLOCK_COUNTS_FROM_ZERO broke ABI and can't be used anymore. */ #define PVCLOCK_COUNTS_FROM_ZERO (1 << 2) #endif /* __ASSEMBLY__ */ #endif /* _ASM_X86_PVCLOCK_ABI_H */ |