Pull bugzilla-9683 into release branch
This commit is contained in:
commit
8df042e85c
|
@ -76,7 +76,11 @@ static void (*pm_idle_save) (void) __read_mostly;
|
||||||
#define PM_TIMER_TICKS_TO_US(p) (((p) * 1000)/(PM_TIMER_FREQUENCY/1000))
|
#define PM_TIMER_TICKS_TO_US(p) (((p) * 1000)/(PM_TIMER_FREQUENCY/1000))
|
||||||
|
|
||||||
static unsigned int max_cstate __read_mostly = ACPI_PROCESSOR_MAX_POWER;
|
static unsigned int max_cstate __read_mostly = ACPI_PROCESSOR_MAX_POWER;
|
||||||
|
#ifdef CONFIG_CPU_IDLE
|
||||||
module_param(max_cstate, uint, 0000);
|
module_param(max_cstate, uint, 0000);
|
||||||
|
#else
|
||||||
|
module_param(max_cstate, uint, 0644);
|
||||||
|
#endif
|
||||||
static unsigned int nocst __read_mostly;
|
static unsigned int nocst __read_mostly;
|
||||||
module_param(nocst, uint, 0000);
|
module_param(nocst, uint, 0000);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue