From b3876838fb8a58ee0f51cbce985713380bfc2336 Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@invisiblethingslab.com>
Date: Thu, 27 Sep 2012 03:10:16 +0200
Subject: [PATCH] pvops: version 3.2.20-1

Minor adjustments in config and patches required by new version.
---
 config-pvops                                              | 2 +-
 ...acpi-sleep-Enable-ACPI-sleep-via-the-__acpi_os_p.patch | 4 ++--
 ...enlighten-Expose-MWAIT-and-MWAIT_LEAF-if-hypervi.patch | 8 ++++----
 rel-pvops                                                 | 2 +-
 version-pvops                                             | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/config-pvops b/config-pvops
index f48d21a..ea81e9e 100644
--- a/config-pvops
+++ b/config-pvops
@@ -2906,6 +2906,7 @@ CONFIG_I2C_SCMI=m
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
+CONFIG_I2C_DESIGNWARE_CORE=m
 CONFIG_I2C_DESIGNWARE_PCI=m
 CONFIG_I2C_GPIO=m
 CONFIG_I2C_INTEL_MID=m
@@ -4813,7 +4814,6 @@ CONFIG_R8187SE=m
 CONFIG_RTL8192U=m
 CONFIG_RTL8192E=m
 CONFIG_R8712U=m
-CONFIG_R8712_AP=y
 CONFIG_RTS_PSTOR=m
 # CONFIG_RTS_PSTOR_DEBUG is not set
 CONFIG_RTS5139=m
diff --git a/patches.xen/pvops-0005-xen-acpi-sleep-Enable-ACPI-sleep-via-the-__acpi_os_p.patch b/patches.xen/pvops-0005-xen-acpi-sleep-Enable-ACPI-sleep-via-the-__acpi_os_p.patch
index 29e1cb8..954b8ff 100644
--- a/patches.xen/pvops-0005-xen-acpi-sleep-Enable-ACPI-sleep-via-the-__acpi_os_p.patch
+++ b/patches.xen/pvops-0005-xen-acpi-sleep-Enable-ACPI-sleep-via-the-__acpi_os_p.patch
@@ -45,8 +45,8 @@ index 12eb07b..a5277c2 100644
 +
 +		xen_acpi_sleep_register();
  	}
- 		
- 
+ #ifdef CONFIG_PCI
+ 	/* PCI BIOS service won't work from a PV guest. */
 diff --git a/drivers/xen/Makefile b/drivers/xen/Makefile
 index aa31337..77a845f 100644
 --- a/drivers/xen/Makefile
diff --git a/patches.xen/pvops-0009-xen-enlighten-Expose-MWAIT-and-MWAIT_LEAF-if-hypervi.patch b/patches.xen/pvops-0009-xen-enlighten-Expose-MWAIT-and-MWAIT_LEAF-if-hypervi.patch
index 2653c38..dfca7f0 100644
--- a/patches.xen/pvops-0009-xen-enlighten-Expose-MWAIT-and-MWAIT_LEAF-if-hypervi.patch
+++ b/patches.xen/pvops-0009-xen-enlighten-Expose-MWAIT-and-MWAIT_LEAF-if-hypervi.patch
@@ -44,9 +44,9 @@ index 12eb07b..4c82936 100644
 --- a/arch/x86/xen/enlighten.c
 +++ b/arch/x86/xen/enlighten.c
 @@ -62,6 +62,14 @@
- #include <asm/reboot.h>
  #include <asm/stackprotector.h>
  #include <asm/hypervisor.h>
+ #include <asm/pci_x86.h>
 +#include <asm/mwait.h>
 +
 +#ifdef CONFIG_ACPI
@@ -93,9 +93,9 @@ index 12eb07b..4c82936 100644
 +		*dx = cpuid_leaf5_edx_val;
 +		return;
 +
- 	case 0xb:
- 		/* Suppress extended topology stuff */
- 		maskebx = 0;
+ 	case CPUID_THERM_POWER_LEAF:
+ 		/* Disabling APERFMPERF for kernel usage */
+ 		maskecx = ~(1 << APERFMPERF_PRESENT);
 @@ -232,9 +253,75 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx,
  
  	*bx &= maskebx;
diff --git a/rel-pvops b/rel-pvops
index f599e28..d00491f 100644
--- a/rel-pvops
+++ b/rel-pvops
@@ -1 +1 @@
-10
+1
diff --git a/version-pvops b/version-pvops
index 406ebcb..6b5085b 100644
--- a/version-pvops
+++ b/version-pvops
@@ -1 +1 @@
-3.2.7
+3.2.30