Skip to contentSkip to conversation

intel_idle: fix intel_idle_state_needs_timer_stop build failure

PATCH In review Arnd Bergmann 2 participants 2 messages Dec 3, 2020 Intel idle driver

lore
Share & tools
lore

Arnd Bergmann

author
#0 lore raw

PATCH 1/1 intel_idle: fix intel_idle_state_needs_timer_stop build failure

From: Arnd Bergmann <[email protected]>

The newly added function is defined inside of an #ifdef section but used outside, leading to a build failure:

drivers/idle/intel_idle.c:1510:7: error: implicit declaration of function 'intel_idle_state_needs_timer_stop' [-Werror,-Wimplicit-function-declaration]

                if (intel_idle_state_needs_timer_stop(&drv->states[drv->state_count]))
                    ^

Move it ahead of the CONFIG_ACPI_PROCESSOR_CSTATE check.

Fixes 6e1d2bc675bd ("intel_idle: Fix intel_idle() vs tracing")
Signed-off-by Arnd Bergmann <[email protected]>
---
 drivers/idle/intel_idle.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)
drivers/idle/intel_idle.c +14 -14
index 7ee7ffe22ae3..d79335506ecd 100644
@@ -1140,6 +1140,20 @@ static bool __init intel_idle_max_cstate_reached(int cstate)
 	return false;
 }
 
+static bool __init intel_idle_state_needs_timer_stop(struct cpuidle_state *state)
+{
+	unsigned long eax = flg2MWAIT(state->flags);
+
+	if (boot_cpu_has(X86_FEATURE_ARAT))
+		return false;
+
+	/*
+	 * Switch over to one-shot tick broadcast if the target C-state
+	 * is deeper than C1.
+	 */
+	return !!((eax >> MWAIT_SUBSTATE_SIZE) & MWAIT_CSTATE_MASK);
+}
+
 #ifdef CONFIG_ACPI_PROCESSOR_CSTATE
 #include <acpi/processor.h>
 

@@ -1210,20 +1224,6 @@ static bool __init intel_idle_acpi_cst_extract(void)
 	return false;
 }
 
-static bool __init intel_idle_state_needs_timer_stop(struct cpuidle_state *state)
-{
-	unsigned long eax = flg2MWAIT(state->flags);
-
-	if (boot_cpu_has(X86_FEATURE_ARAT))
-		return false;
-
-	/*
-	 * Switch over to one-shot tick broadcast if the target C-state
-	 * is deeper than C1.
-	 */
-	return !!((eax >> MWAIT_SUBSTATE_SIZE) & MWAIT_CSTATE_MASK);
-}
-
 static void __init intel_idle_init_cstates_acpi(struct cpuidle_driver *drv)
 {
 	int cstate, limit = min_t(int, CPUIDLE_STATE_MAX, acpi_state_table.count);
Signature · 1 line
2.27.0
#1 lore raw
Quoted 9 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

The newly added function is defined inside of an #ifdef section but used outside, leading to a build failure:

drivers/idle/intel_idle.c:1510:7: error: implicit declaration of function 'intel_idle_state_needs_timer_stop' [-Werror,-Wimplicit-function-declaration]

                if (intel_idle_state_needs_timer_stop(&drv->states[drv->state_count]))
                    ^
Quoted 8 lines

Move it ahead of the CONFIG_ACPI_PROCESSOR_CSTATE check.

Fixes 6e1d2bc675bd ("intel_idle: Fix intel_idle() vs tracing")
Signed-off-by Arnd Bergmann <[email protected]>
---
 drivers/idle/intel_idle.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

Peter has already fixed this one.

thanks.

Signature · 1 line
~Randy