diff options
| author | Len Brown <len.brown@intel.com> | 2010-07-22 18:19:12 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-07-22 18:19:12 -0400 |
| commit | bbac30edb39a80426e4a3420a5ec635eb4466f63 (patch) | |
| tree | 2c69ae7372ba4695e32218e866baa27910f5a928 /drivers/acpi/processor_idle.c | |
| parent | 4a973f2495fba8775d1c408b3ee7f2c19b19f13f (diff) | |
| parent | 6c9c0fd062a6540dbee233151679b5f03ce433d9 (diff) | |
Merge branch 'misc' into release
Diffstat (limited to 'drivers/acpi/processor_idle.c')
| -rw-r--r-- | drivers/acpi/processor_idle.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 1d4104855296..e9a8026d39f0 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c | |||
| @@ -82,10 +82,13 @@ module_param(bm_check_disable, uint, 0000); | |||
| 82 | static unsigned int latency_factor __read_mostly = 2; | 82 | static unsigned int latency_factor __read_mostly = 2; |
| 83 | module_param(latency_factor, uint, 0644); | 83 | module_param(latency_factor, uint, 0644); |
| 84 | 84 | ||
| 85 | #ifdef CONFIG_ACPI_PROCFS | ||
| 85 | static u64 us_to_pm_timer_ticks(s64 t) | 86 | static u64 us_to_pm_timer_ticks(s64 t) |
| 86 | { | 87 | { |
| 87 | return div64_u64(t * PM_TIMER_FREQUENCY, 1000000); | 88 | return div64_u64(t * PM_TIMER_FREQUENCY, 1000000); |
| 88 | } | 89 | } |
| 90 | #endif | ||
| 91 | |||
| 89 | /* | 92 | /* |
| 90 | * IBM ThinkPad R40e crashes mysteriously when going into C2 or C3. | 93 | * IBM ThinkPad R40e crashes mysteriously when going into C2 or C3. |
| 91 | * For now disable this. Probably a bug somewhere else. | 94 | * For now disable this. Probably a bug somewhere else. |