set CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y

diff --git a/Makefile b/Makefile
index b1d1a3ba87df1be47b3450cf7b44cddcf06f162d..0fdc0e273dbb8ed07a1303d762d16a2f15f1f112 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 RELEASE=3.1
 
 KERNEL_VER=3.10.0
-PKGREL=5
+PKGREL=6
 # also include firmware of previous versrion into 
 # the fw package:  fwlist-2.6.32-PREV-pve
 KREL=1

diff --git a/README b/README
index d5c07d853328328a2da57f3bd1723ca5c6db5c30..c3d39360b9204237b1d7513f4d32dfe3293e0287 100644 (file)
--- a/README
+++ b/README
@@ -100,6 +100,13 @@ see config-3.10.0.diff
 
   Use same SELINUX config as debian kernels (CONFIG_DEFAULT_SECURITY_DAC=y)
 
+- set CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+
+  because if not set, it can give some dynamic memory or cpu frequencies 
+  change, and vms can crash (mainly windows guest).
+
+  see http://forum.proxmox.com/threads/18238-Windows-7-x64-VMs-crashing-randomly-during-process-termination?p=93273#post93273
+
 # Note: enable now for testing
 #- disable CONFIG_BRIDGE_IGMP_SNOOPING 
 #

diff --git a/changelog.Debian b/changelog.Debian
index 96a02ce4a482ace7fab80e341b03f83405c80861..3790fcfd5a2edb0b1a1279004a523750b331ac7f 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+pve-kernel-3.10.0 (3.10.0-6) unstable; urgency=low
+
+  * set CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+  
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 10 Apr 2014 08:39:31 +0200
+
 pve-kernel-3.10.0 (3.10.0-5) unstable; urgency=low
 
   * set CONFIG_BRIDGE=y

diff --git a/config-3.10.0.diff b/config-3.10.0.diff
index 7970e73f765ad2827dbbba50f514afd2cdf5f604..1752e99a2e522221257c7be2ff67b0592e03a6ca 100644 (file)
--- a/config-3.10.0.diff
+++ b/config-3.10.0.diff
@@ -1,5 +1,5 @@
---- rh-kernel-src/kernel-3.10.0-x86_64.config  2013-12-16 08:05:07.513206660 +0100
-+++ linux-2.6-3.10.0/.config   2013-12-17 12:51:02.505690103 +0100
+--- rh-kernel-src/kernel-3.10.0-x86_64.config  2013-12-16 08:05:07.000000000 +0100
++++ config-3.10.0      2014-04-10 08:36:55.000000000 +0200
 @@ -1,7 +1,6 @@
 -# x86_64
  #
@@ -27,6 +27,18 @@
  CONFIG_STOP_MACHINE=y
  CONFIG_BLOCK=y
  CONFIG_BLK_DEV_BSG=y
+@@ -583,9 +573,9 @@
+ CONFIG_CPU_FREQ_GOV_COMMON=y
+ CONFIG_CPU_FREQ_STAT=m
+ CONFIG_CPU_FREQ_STAT_DETAILS=y
+-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
++CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+ # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
++# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+ # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+ CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 @@ -1122,10 +1112,10 @@
  CONFIG_L2TP_V3=y
  CONFIG_L2TP_IP=m