lkml.org 
[lkml]   [2014]   [Sep]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 096/131] MIPS: perf: Fix build error caused by unused counters_per_cpu_to_total()
    3.2.63-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Florian Fainelli <florian@openwrt.org>

    commit 6c37c9580409af7dc664bb6af0a85d540d63aeea upstream.

    cc1: warnings being treated as errors
    arch/mips/kernel/perf_event_mipsxx.c:166: error: 'counters_per_cpu_to_total' defined but not used
    make[2]: *** [arch/mips/kernel/perf_event_mipsxx.o] Error 1
    make[2]: *** Waiting for unfinished jobs....

    It was first introduced by 82091564cfd7ab8def42777a9c662dbf655c5d25 [MIPS:
    perf: Add support for 64-bit perf counters.] in 3.2.

    Signed-off-by: Florian Fainelli <florian@openwrt.org>
    Cc: linux-mips@linux-mips.org
    Cc: david.daney@cavium.com
    Patchwork: https://patchwork.linux-mips.org/patch/3357/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    arch/mips/kernel/perf_event_mipsxx.c | 5 -----
    1 file changed, 5 deletions(-)

    diff --git a/arch/mips/kernel/perf_event_mipsxx.c b/arch/mips/kernel/perf_event_mipsxx.c
    index f29099b..eb5e394 100644
    --- a/arch/mips/kernel/perf_event_mipsxx.c
    +++ b/arch/mips/kernel/perf_event_mipsxx.c
    @@ -162,11 +162,6 @@ static unsigned int counters_total_to_per_cpu(unsigned int counters)
    return counters >> vpe_shift();
    }

    -static unsigned int counters_per_cpu_to_total(unsigned int counters)
    -{
    - return counters << vpe_shift();
    -}
    -
    #else /* !CONFIG_MIPS_MT_SMP */
    #define vpe_id() 0



    \
     
     \ /
      Last update: 2014-09-11 15:21    [W:4.553 / U:0.268 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site