pvops: version 3.2.20-1
Minor adjustments in config and patches required by new version.
This commit is contained in:
parent
05531a8448
commit
b3876838fb
@ -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
|
||||
|
@ -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
|
||||
|
@ -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;
|
||||
|
@ -1 +1 @@
|
||||
3.2.7
|
||||
3.2.30
|
||||
|
Loading…
Reference in New Issue
Block a user