From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Mon, 11 Jun 2012 14:26:24 +0000 (-0400)
Subject: Revert "Merge branch 'stable/for-linus-3.5' into linux-next"
X-Git-Tag: next-20120724~28^2~11
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6999aeffde1728f64a9092202c899806c4e205f0;p=karo-tx-linux.git

Revert "Merge branch 'stable/for-linus-3.5' into linux-next"

This reverts commit 3e3e4db43b28a2a47d6535f18e624edf1235da9a, reversing
changes made to 703daa2fcb5fc845605030948e18807fdd1f5e5c.
---

diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index be810413bd34..f9b6f3060cb5 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -209,9 +209,6 @@ static void __init xen_banner(void)
 	       xen_feature(XENFEAT_mmu_pt_update_preserve_ad) ? " (preserve-AD)" : "");
 }
 
-#define CPUID_THERM_POWER_LEAF 6
-#define APERFMPERF_PRESENT 0
-
 static __read_mostly unsigned int cpuid_leaf1_edx_mask = ~0;
 static __read_mostly unsigned int cpuid_leaf1_ecx_mask = ~0;
 
@@ -245,11 +242,6 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx,
 		*dx = cpuid_leaf5_edx_val;
 		return;
 
-	case CPUID_THERM_POWER_LEAF:
-		/* Disabling APERFMPERF for kernel usage */
-		maskecx = ~(1 << APERFMPERF_PRESENT);
-		break;
-
 	case 0xb:
 		/* Suppress extended topology stuff */
 		maskebx = 0;
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
index 82b1212d2bff..464a3329bac8 100644
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -308,20 +308,8 @@ static bool xen_batched_set_pte(pte_t *ptep, pte_t pteval)
 
 static inline void __xen_set_pte(pte_t *ptep, pte_t pteval)
 {
-	if (!xen_batched_set_pte(ptep, pteval)) {
-		/*
-		 * Could call native_set_pte() here and trap and
-		 * emulate the PTE write but with 32-bit guests this
-		 * needs two traps (one for each of the two 32-bit
-		 * words in the PTE) so do one hypercall directly
-		 * instead.
-		 */
-		struct mmu_update u;
-
-		u.ptr = virt_to_machine(ptep).maddr | MMU_NORMAL_PT_UPDATE;
-		u.val = pte_val_ma(pteval);
-		HYPERVISOR_mmu_update(&u, 1, NULL, DOMID_SELF);
-	}
+	if (!xen_batched_set_pte(ptep, pteval))
+		native_set_pte(ptep, pteval);
 }
 
 static void xen_set_pte(pte_t *ptep, pte_t pteval)