From f005f47fffcff7aab63f376d6c8fbcb7a9ab96ee Mon Sep 17 00:00:00 2001
From: Len Brown <len.brown@intel.com>
Date: Thu, 13 Dec 2007 23:50:45 -0500
Subject: [PATCH] --- yaml --- r: 84111 b: refs/heads/master c:
 4963f62045b64f93c45fbcb6f8f0baf1e3e7a127 h: refs/heads/master i:   84109:
 d42a3ba673dd14b97f7e036fa7b07bd21a9eae47   84107:
 61e202679432f722f0f46e5a7046e79277c5cae0   84103:
 0928f51cee6f9905f995c1da589c2cab953da475   84095:
 dd26dc39516ffe5df397a690abfcc3a4a0bf6702 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/acpi/processor_idle.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8aeb5787c3a3..0f028b53dafa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60555e371d56a1e410d9fb6fc68f4e953f8f4109
+refs/heads/master: 4963f62045b64f93c45fbcb6f8f0baf1e3e7a127
diff --git a/trunk/drivers/acpi/processor_idle.c b/trunk/drivers/acpi/processor_idle.c
index f996d0e37689..26ade1f3f5cd 100644
--- a/trunk/drivers/acpi/processor_idle.c
+++ b/trunk/drivers/acpi/processor_idle.c
@@ -94,6 +94,9 @@ module_param(bm_history, uint, 0644);
 
 static int acpi_processor_set_power_policy(struct acpi_processor *pr);
 
+#else	/* CONFIG_CPU_IDLE */
+static unsigned int latency_factor __read_mostly = 6;
+module_param(latency_factor, uint, 0644);
 #endif
 
 /*
@@ -1576,7 +1579,7 @@ static int acpi_processor_setup_cpuidle(struct acpi_processor *pr)
 
 		snprintf(state->name, CPUIDLE_NAME_LEN, "C%d", i);
 		state->exit_latency = cx->latency;
-		state->target_residency = cx->latency * 6;
+		state->target_residency = cx->latency * latency_factor;
 		state->power_usage = cx->power;
 
 		state->flags = 0;