diff mbox series

intel_idle: fix intel_idle_state_needs_timer_stop build failure

Message ID 20201203223020.1173185-1-arnd@kernel.org
State New
Headers show
Series intel_idle: fix intel_idle_state_needs_timer_stop build failure | expand

Commit Message

Arnd Bergmann Dec. 3, 2020, 10:30 p.m. UTC 
From: Arnd Bergmann <arnd@arndb.de>


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 <arnd@arndb.de>

---
 drivers/idle/intel_idle.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

-- 
2.27.0

Comments

Randy Dunlap Dec. 3, 2020, 11:12 p.m. UTC | #1 
On 12/3/20 2:30 PM, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>

> 

> 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 <arnd@arndb.de>

> ---

>  drivers/idle/intel_idle.c | 28 ++++++++++++++--------------

>  1 file changed, 14 insertions(+), 14 deletions(-)

> 


Peter has already fixed this one.

thanks.
-- 
~Randy
diff mbox series

Patch

diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
index 7ee7ffe22ae3..d79335506ecd 100644
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@ -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);