diff options
| author | Len Brown <len.brown@intel.com> | 2008-01-11 12:28:38 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-01-11 12:28:38 -0500 |
| commit | 8df042e85c4462f97be286ef0fd82a627f27e9c8 (patch) | |
| tree | db40c797112b10895c4e6a5a3aea5172e15f05f2 /drivers/acpi | |
| parent | 456212017bf21f6bbdf972a5eafab987600956b2 (diff) | |
| parent | 5b3f0e6c1c9638b11a1063bf93c60a0766550b02 (diff) | |
Pull bugzilla-9683 into release branch
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/processor_idle.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 2fe34cc73c13..2235f4e02d26 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c | |||
| @@ -76,7 +76,11 @@ static void (*pm_idle_save) (void) __read_mostly; | |||
| 76 | #define PM_TIMER_TICKS_TO_US(p) (((p) * 1000)/(PM_TIMER_FREQUENCY/1000)) | 76 | #define PM_TIMER_TICKS_TO_US(p) (((p) * 1000)/(PM_TIMER_FREQUENCY/1000)) |
| 77 | 77 | ||
| 78 | static unsigned int max_cstate __read_mostly = ACPI_PROCESSOR_MAX_POWER; | 78 | static unsigned int max_cstate __read_mostly = ACPI_PROCESSOR_MAX_POWER; |
| 79 | #ifdef CONFIG_CPU_IDLE | ||
| 79 | module_param(max_cstate, uint, 0000); | 80 | module_param(max_cstate, uint, 0000); |
| 81 | #else | ||
| 82 | module_param(max_cstate, uint, 0644); | ||
| 83 | #endif | ||
| 80 | static unsigned int nocst __read_mostly; | 84 | static unsigned int nocst __read_mostly; |
| 81 | module_param(nocst, uint, 0000); | 85 | module_param(nocst, uint, 0000); |
| 82 | 86 | ||