From: S.Çağlar Onur Date: Tue, 23 Nov 2010 19:20:45 +0000 (-0500) Subject: bump to 2.6.27.56 and remove linux-2.6-920-cstate.patch as it's irrevelant X-Git-Tag: linux-2.6-27-31~1 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=56c6955bced54ea5935b36731a7cc95a3ded8d80;p=linux-2.6.git bump to 2.6.27.56 and remove linux-2.6-920-cstate.patch as it's irrevelant --- diff --git a/kernel-2.6.spec b/kernel-2.6.spec index 2eae010c6..abf71c28a 100644 --- a/kernel-2.6.spec +++ b/kernel-2.6.spec @@ -37,7 +37,7 @@ Summary: The Linux kernel (the core of the Linux operating system) # adding some text to the end of the version number. # %define sublevel 27 -%define patchlevel 55 +%define patchlevel 56 %define kversion 2.6.%{sublevel} %define rpmversion 2.6.%{sublevel}%{?patchlevel:.%{patchlevel}} @@ -204,9 +204,6 @@ Patch800: linux-2.6-800-rename-ext4dev-to-ext4.patch #Patch900: linux-2.6-900-ext3_mount_default_to_barrier.patch #Patch910: linux-2.6-910-support_barriers_on_single_device_dm_devices.patch -# ACPI: Idle C-states disabled by max_cstate should not disable the TSC -Patch920: linux-2.6-920-cstate.patch - BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root %description @@ -415,8 +412,6 @@ KERNEL_PREVIOUS=vanilla %ApplyPatch 910 %endif -%ApplyPatch 920 - # NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may # break with later patches. diff --git a/linux-2.6-920-cstate.patch b/linux-2.6-920-cstate.patch deleted file mode 100644 index b77944877..000000000 --- a/linux-2.6-920-cstate.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 15241406018b861ea4441786cb5f424c9e308034 -Author: S.Çağlar Onur -Date: Thu Nov 18 16:25:37 2010 -0500 - - ACPI: Idle C-states disabled by max_cstate should not disable the TSC - -diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c -index 94483a2..5812380 100644 ---- a/drivers/acpi/processor_idle.c -+++ b/drivers/acpi/processor_idle.c -@@ -1158,7 +1158,7 @@ static int acpi_processor_power_verify(struct acpi_processor *pr) - - pr->power.timer_broadcast_on_state = INT_MAX; - -- for (i = 1; i < ACPI_PROCESSOR_MAX_POWER; i++) { -+ for (i = 1; i < ACPI_PROCESSOR_MAX_POWER && i <= max_cstate; i++) { - struct acpi_processor_cx *cx = &pr->power.states[i]; - - switch (cx->type) { diff --git a/sources b/sources index b90ceecd1..cc351e293 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ b3e78977aa79d3754cb7f8143d7ddabd http://build.planet-lab.org/third-party/linux-2.6.27.tar.bz2 -e53a3beb725b719e106b5431881ea7e7 http://ftp.kernel.org/pub/linux/kernel/v2.6/patch-2.6.27.55.bz2 -ea81cda32a2310c87c12972ed69b83b5 http://www.cs.princeton.edu/~caglar/patch-2.6.27.55-vs2.3.0.36.4.diff +05243ac032539cf186eb969e63347fca http://ftp.kernel.org/pub/linux/kernel/v2.6/patch-2.6.27.56.bz2 +ea81cda32a2310c87c12972ed69b83b5 http://www.cs.princeton.edu/~caglar/patch-2.6.27.56-vs2.3.0.36.4.diff