From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 Mar 2011 17:45:21 +0000 (-0700)
Subject: Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~7613^2~2153
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f2e1fbb5f2177227f71c4fc0491e531dd7acd385;p=firefly-linux-kernel-4.4.55.git

Merge branch 'x86-fixes-for-linus' of git://git./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
---

f2e1fbb5f2177227f71c4fc0491e531dd7acd385
diff --cc arch/x86/kvm/paging_tmpl.h
index 751405097d8c,a51517d9eb51..c6397795d865
--- a/arch/x86/kvm/paging_tmpl.h
+++ b/arch/x86/kvm/paging_tmpl.h
@@@ -337,16 -339,16 +337,16 @@@ static void FNAME(update_pte)(struct kv
  
  	pgprintk("%s: gpte %llx spte %p\n", __func__, (u64)gpte, spte);
  	pte_access = sp->role.access & FNAME(gpte_access)(vcpu, gpte);
 -	if (gpte_to_gfn(gpte) != vcpu->arch.update_pte.gfn)
 +	pfn = gfn_to_pfn_atomic(vcpu->kvm, gpte_to_gfn(gpte));
 +	if (is_error_pfn(pfn)) {
 +		kvm_release_pfn_clean(pfn);
  		return;
 -	pfn = vcpu->arch.update_pte.pfn;
 -	if (is_error_pfn(pfn))
 -		return;
 -	if (mmu_notifier_retry(vcpu, vcpu->arch.update_pte.mmu_seq))
 +	}
 +	if (mmu_notifier_retry(vcpu, mmu_seq))
  		return;
 -	kvm_get_pfn(pfn);
 +
  	/*
- 	 * we call mmu_set_spte() with host_writable = true beacuse that
+ 	 * we call mmu_set_spte() with host_writable = true because that
  	 * vcpu->arch.update_pte.pfn was fetched from get_user_pages(write = 1).
  	 */
  	mmu_set_spte(vcpu, spte, sp->role.access, pte_access, 0, 0,