summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/pvclock.h
diff options
context:
space:
mode:
authorMarcelo Tosatti <mtosatti@redhat.com>2015-03-24 02:21:51 +0300
committerMarcelo Tosatti <mtosatti@redhat.com>2015-03-24 02:22:48 +0300
commit0a4e6be9ca17c54817cf814b4b5aa60478c6df27 (patch)
tree461ed6cace26da5c75d1c01982fde2f3ccc5d4fa /arch/x86/include/asm/pvclock.h
parent58d2930f4ee335ab703d768cb0318331fc1bb62c (diff)
downloadlinux-0a4e6be9ca17c54817cf814b4b5aa60478c6df27.tar.xz
x86: kvm: Revert "remove sched notifier for cross-cpu migrations"
The following point: 2. per-CPU pvclock time info is updated if the underlying CPU changes. Is not true anymore since "KVM: x86: update pvclock area conditionally, on cpu migration". Add task migration notification back. Problem noticed by Andy Lutomirski. Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> CC: stable@kernel.org # 3.11+
Diffstat (limited to 'arch/x86/include/asm/pvclock.h')
-rw-r--r--arch/x86/include/asm/pvclock.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/pvclock.h b/arch/x86/include/asm/pvclock.h
index d6b078e9fa28..25b1cc07d496 100644
--- a/arch/x86/include/asm/pvclock.h
+++ b/arch/x86/include/asm/pvclock.h
@@ -95,6 +95,7 @@ unsigned __pvclock_read_cycles(const struct pvclock_vcpu_time_info *src,
struct pvclock_vsyscall_time_info {
struct pvclock_vcpu_time_info pvti;
+ u32 migrate_count;
} __attribute__((__aligned__(SMP_CACHE_BYTES)));
#define PVTI_SIZE sizeof(struct pvclock_vsyscall_time_info)