mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Merge branch 'misc' into release
Conflicts: arch/x86/kernel/process.c Signed-off-by: Len Brown <[email protected]>
This commit is contained in:
commit
ca62cf59ce
8 changed files with 15 additions and 140 deletions
|
|
@ -71,7 +71,6 @@ static struct acpi_processor_cx *acpi_cstate[CPUIDLE_STATE_MAX];
|
|||
static int disabled_by_idle_boot_param(void)
|
||||
{
|
||||
return boot_option_idle_override == IDLE_POLL ||
|
||||
boot_option_idle_override == IDLE_FORCE_MWAIT ||
|
||||
boot_option_idle_override == IDLE_HALT;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue