Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

* '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

diff --cc arch/x86/kernel/apic/io_apic.c
Simple merge

diff --cc arch/x86/kernel/apm_32.c
Simple merge

diff --cc arch/x86/kernel/cpu/cpufreq/powernow-k8.c
Simple merge

diff --cc arch/x86/kernel/cpu/perf_event.c
Simple merge

diff --cc arch/x86/kvm/paging_tmpl.h
index 751405097d8cc209c51c3e94b6186abc2de670ae,a51517d9eb51ed83a0bbe3a6fa2694b192072bf3..c6397795d865357cda212faf91c3a59f6938d341
--- 1/arch/x86/kvm/paging_tmpl.h
--- 2/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,

diff --cc arch/x86/kvm/x86.c
Simple merge

diff --cc arch/x86/xen/mmu.c
Simple merge