lkml.org 
[lkml]   [2013]   [Sep]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[060/251] MIPS: Oceton: Fix build error.
    3.6.11.9-rc1 stable review patch.
    If anyone has any objections, please let me know.

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

    From: Ralf Baechle <ralf@linux-mips.org>

    [ Upstream commit 39205750efa6d335fac4f9bcd32b49c7e71c12b7 ]

    If CONFIG_CAVIUM_OCTEON_LOCK_L2_TLB, CONFIG_CAVIUM_OCTEON_LOCK_L2_EXCEPTION,
    CONFIG_CAVIUM_OCTEON_LOCK_L2_LOW_LEVEL_INTERRUPT and
    CONFIG_CAVIUM_OCTEON_LOCK_L2_INTERRUPT are all undefined:

    arch/mips/cavium-octeon/setup.c: In function ‘prom_init’:
    arch/mips/cavium-octeon/setup.c:715:12: error: unused variable ‘ebase’ [-Werror=unused-variable]

    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    ---
    arch/mips/cavium-octeon/setup.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c
    index 919b0fb..19ce979 100644
    --- a/arch/mips/cavium-octeon/setup.c
    +++ b/arch/mips/cavium-octeon/setup.c
    @@ -6,6 +6,7 @@
    * Copyright (C) 2004-2007 Cavium Networks
    * Copyright (C) 2008 Wind River Systems
    */
    +#include <linux/compiler.h>
    #include <linux/init.h>
    #include <linux/console.h>
    #include <linux/delay.h>
    @@ -504,7 +505,7 @@ void __init prom_init(void)
    if (cvmx_read_csr(CVMX_L2D_FUS3) & (3ull << 34)) {
    pr_info("Skipping L2 locking due to reduced L2 cache size\n");
    } else {
    - uint32_t ebase = read_c0_ebase() & 0x3ffff000;
    + uint32_t __maybe_unused ebase = read_c0_ebase() & 0x3ffff000;
    #ifdef CONFIG_CAVIUM_OCTEON_LOCK_L2_TLB
    /* TLB refill */
    cvmx_l2c_lock_mem_region(ebase, 0x100);
    --
    1.7.10.4

    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2013-09-11 08:41    [W:4.333 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site