Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'locking-urgent-2020-12-06' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull intel_idle build fix from Thomas Gleixner:
"A tiny build fix for a recent change in the intel_idle driver which
missed a CONFIG dependency and broke the build for certain
configurations"
* tag 'locking-urgent-2020-12-06' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
intel_idle: Build fix
+14
-14
+14
-14
drivers/idle/intel_idle.c
+14
-14
drivers/idle/intel_idle.c
···
1140
1140
return false;
1141
1141
}
1142
1142
1143
+
static bool __init intel_idle_state_needs_timer_stop(struct cpuidle_state *state)
1144
+
{
1145
+
unsigned long eax = flg2MWAIT(state->flags);
1146
+
1147
+
if (boot_cpu_has(X86_FEATURE_ARAT))
1148
+
return false;
1149
+
1150
+
/*
1151
+
* Switch over to one-shot tick broadcast if the target C-state
1152
+
* is deeper than C1.
1153
+
*/
1154
+
return !!((eax >> MWAIT_SUBSTATE_SIZE) & MWAIT_CSTATE_MASK);
1155
+
}
1156
+
1143
1157
#ifdef CONFIG_ACPI_PROCESSOR_CSTATE
1144
1158
#include <acpi/processor.h>
1145
1159
···
1222
1208
acpi_state_table.count = 0;
1223
1209
pr_debug("ACPI _CST not found or not usable\n");
1224
1210
return false;
1225
-
}
1226
-
1227
-
static bool __init intel_idle_state_needs_timer_stop(struct cpuidle_state *state)
1228
-
{
1229
-
unsigned long eax = flg2MWAIT(state->flags);
1230
-
1231
-
if (boot_cpu_has(X86_FEATURE_ARAT))
1232
-
return false;
1233
-
1234
-
/*
1235
-
* Switch over to one-shot tick broadcast if the target C-state
1236
-
* is deeper than C1.
1237
-
*/
1238
-
return !!((eax >> MWAIT_SUBSTATE_SIZE) & MWAIT_CSTATE_MASK);
1239
1211
}
1240
1212
1241
1213
static void __init intel_idle_init_cstates_acpi(struct cpuidle_driver *drv)