Skip to content

L
linux
Commit bbac30ed authored by Len Brown's avatar Len Brown
Browse files
Options

Merge branch 'misc' into release

parents 4a973f24 6c9c0fd0
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
drivers/acpi/processor_idle.c
View file @ bbac30ed
...@@ -82,10 +82,13 @@ module_param(bm_check_disable, uint, 0000); ...@@ -82,10 +82,13 @@ module_param(bm_check_disable, uint, 0000);
static unsigned int latency_factor __read_mostly = 2; static unsigned int latency_factor __read_mostly = 2;
module_param(latency_factor, uint, 0644); module_param(latency_factor, uint, 0644);
#ifdef CONFIG_ACPI_PROCFS
static u64 us_to_pm_timer_ticks(s64 t) static u64 us_to_pm_timer_ticks(s64 t)
{ {
return div64_u64(t * PM_TIMER_FREQUENCY, 1000000); return div64_u64(t * PM_TIMER_FREQUENCY, 1000000);
} }
#endif
/* /*
* IBM ThinkPad R40e crashes mysteriously when going into C2 or C3. * IBM ThinkPad R40e crashes mysteriously when going into C2 or C3.
* For now disable this. Probably a bug somewhere else. * For now disable this. Probably a bug somewhere else.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7