From 17dbd25bdb5989282079774e344a75226cf73f69 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Thu, 18 Nov 2010 16:31:38 -0500 Subject: [PATCH] ACPI: Idle C-states disabled by max_cstate should not disable the TSC (aka boot on Dell R410) --- kernel-2.6.spec | 5 +++++ linux-2.6-920-cstate.patch | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 linux-2.6-920-cstate.patch diff --git a/kernel-2.6.spec b/kernel-2.6.spec index 2ce647b21..f7158f603 100644 --- a/kernel-2.6.spec +++ b/kernel-2.6.spec @@ -204,6 +204,9 @@ 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 @@ -412,6 +415,8 @@ 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 new file mode 100644 index 000000000..b77944877 --- /dev/null +++ b/linux-2.6-920-cstate.patch @@ -0,0 +1,19 @@ +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) { -- 2.47.0