[kernel] r9740 - in dists/trunk/linux-2.6/debian: . config/amd64 config/i386
Maximilian Attems
maks at alioth.debian.org
Mon Nov 26 12:49:17 UTC 2007
Author: maks
Date: Mon Nov 26 12:49:17 2007
New Revision: 9740
Log:
Revert "amd64, i386: match cpufrequtils default"
strange upstream Kconfig plays, need to be fixed there first.
This reverts commit 637429830e9be6a4ef7163481969c77d50e0ba09.
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/config/amd64/config
dists/trunk/linux-2.6/debian/config/i386/config
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog (original)
+++ dists/trunk/linux-2.6/debian/changelog Mon Nov 26 12:49:17 2007
@@ -28,7 +28,6 @@
* Add and enable E1000E.
* Add stable release 2.6.23.1:
- libata: sata_mv: more S/G fixes
- * [amd64], [i386]: Set CPU_FREQ_DEFAULT_GOV_ONDEMAND to match cpufrequtils.
[ Martin Michlmayr ]
* [mips] Add a bcm1480 PCI build fix.
@@ -241,7 +240,7 @@
- wait_task_stopped: Check p->exit_state instead of TASK_TRACED (CVE-2007-5500)
- TCP: Make sure write_queue_from does not begin with NULL ptr (CVE-2007-5501)
- -- maximilian attems <maks at debian.org> Sun, 25 Nov 2007 15:55:18 +0100
+ -- maximilian attems <maks at debian.org> Sun, 25 Nov 2007 15:48:01 +0100
linux-2.6 (2.6.22-6) unstable; urgency=low
Modified: dists/trunk/linux-2.6/debian/config/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/config (original)
+++ dists/trunk/linux-2.6/debian/config/amd64/config Mon Nov 26 12:49:17 2007
@@ -61,13 +61,12 @@
CONFIG_CPU_FREQ_TABLE=m
# CONFIG_CPU_FREQ_DEBUG is not set
CONFIG_CPU_FREQ_STAT=m
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=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_GOV_PERFORMANCE=m
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
CONFIG_CPU_FREQ_GOV_POWERSAVE=m
CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
CONFIG_X86_POWERNOW_K8=m
CONFIG_X86_POWERNOW_K8_ACPI=y
Modified: dists/trunk/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config (original)
+++ dists/trunk/linux-2.6/debian/config/i386/config Mon Nov 26 12:49:17 2007
@@ -90,13 +90,12 @@
CONFIG_CPU_FREQ_TABLE=m
# CONFIG_CPU_FREQ_DEBUG is not set
CONFIG_CPU_FREQ_STAT=m
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=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_GOV_PERFORMANCE=m
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
CONFIG_CPU_FREQ_GOV_POWERSAVE=m
CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
CONFIG_X86_ACPI_CPUFREQ=m
CONFIG_X86_POWERNOW_K6=m
More information about the Kernel-svn-changes
mailing list