lkml.org 
[lkml]   [2020]   [Dec]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 075/105] intel_idle: Build fix
    Date
    From: Peter Zijlstra <peterz@infradead.org>

    [ Upstream commit 4d916140bf28ff027997144ea1bb4299e1536f87 ]

    Because CONFIG_ soup.

    Fixes: 6e1d2bc675bd ("intel_idle: Fix intel_idle() vs tracing")
    Reported-by: Randy Dunlap <rdunlap@infradead.org>
    Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    Link: https://lkml.kernel.org/r/20201130115402.GO3040@hirez.programming.kicks-ass.net
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/idle/intel_idle.c | 28 ++++++++++++++--------------
    1 file changed, 14 insertions(+), 14 deletions(-)

    diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
    index cc6d1b12388e1..3a1617a3e5bf7 100644
    --- a/drivers/idle/intel_idle.c
    +++ b/drivers/idle/intel_idle.c
    @@ -1136,6 +1136,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>

    @@ -1206,20 +1220,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);
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-14 19:31    [W:8.685 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site