diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-18 13:45:21 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-18 13:45:21 -0400 |
commit | f2e1fbb5f2177227f71c4fc0491e531dd7acd385 (patch) | |
tree | c45485e3cd8a04f78184ef3bd9ce6972c74ac834 /arch/x86/kvm/x86.c | |
parent | 508996b6a0ef0c7aa7701995d137e71c56180752 (diff) | |
parent | 4981d01eada5354d81c8929d5b2836829ba3df7b (diff) |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Flush TLB if PGD entry is changed in i386 PAE mode
x86, dumpstack: Correct stack dump info when frame pointer is available
x86: Clean up csum-copy_64.S a bit
x86: Fix common misspellings
x86: Fix misspelling and align params
x86: Use PentiumPro-optimized partial_csum() on VIA C7
Diffstat (limited to 'arch/x86/kvm/x86.c')
-rw-r--r-- | arch/x86/kvm/x86.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index f1e4025f1ae2..58f517b59645 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c | |||
@@ -1031,7 +1031,7 @@ void kvm_write_tsc(struct kvm_vcpu *vcpu, u64 data) | |||
1031 | /* | 1031 | /* |
1032 | * Special case: close write to TSC within 5 seconds of | 1032 | * Special case: close write to TSC within 5 seconds of |
1033 | * another CPU is interpreted as an attempt to synchronize | 1033 | * another CPU is interpreted as an attempt to synchronize |
1034 | * The 5 seconds is to accomodate host load / swapping as | 1034 | * The 5 seconds is to accommodate host load / swapping as |
1035 | * well as any reset of TSC during the boot process. | 1035 | * well as any reset of TSC during the boot process. |
1036 | * | 1036 | * |
1037 | * In that case, for a reliable TSC, we can match TSC offsets, | 1037 | * In that case, for a reliable TSC, we can match TSC offsets, |