diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-18 13:49:29 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-18 13:49:29 +0100 |
| commit | a090b22f3fafa9340f903834de87552b50c5f2ba (patch) | |
| tree | d07b55c9d60d585f8ceed2c8f43e8a04309fc67e /drivers/acpi/processor_idle.c | |
| parent | 0b3571274b8ff53c0e08bc667ecd3d8a43bd8714 (diff) | |
| parent | b43e1065cab4b5be90c016b2f076086b70cd1556 (diff) | |
Merge branch 'acpica' into acpi-lpss
The following commits depend on the 'acpica' material.
Diffstat (limited to 'drivers/acpi/processor_idle.c')
| -rw-r--r-- | drivers/acpi/processor_idle.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index f1a5da44591..6ea26eae391 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c @@ -64,10 +64,11 @@ #define ACPI_PROCESSOR_CLASS "processor" #define _COMPONENT ACPI_PROCESSOR_COMPONENT ACPI_MODULE_NAME("processor_idle"); -#define PM_TIMER_TICK_NS (1000000000ULL/PM_TIMER_FREQUENCY) +#define PM_TIMER_TICK_NS (1000000000ULL/ACPI_PM_TIMER_FREQUENCY) #define C2_OVERHEAD 1 /* 1us */ #define C3_OVERHEAD 1 /* 1us */ -#define PM_TIMER_TICKS_TO_US(p) (((p) * 1000)/(PM_TIMER_FREQUENCY/1000)) +#define PM_TIMER_TICKS_TO_US(p) \ + (((p) * 1000)/(ACPI_PM_TIMER_FREQUENCY/1000)) static unsigned int max_cstate __read_mostly = ACPI_PROCESSOR_MAX_POWER; module_param(max_cstate, uint, 0000); |