diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2013-06-12 19:29:24 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-28 19:30:07 -0400 |
commit | cf6a37e7da73702e865a02f03664fc0e2c4a2b3f (patch) | |
tree | c26a3aa68dc2317c6d8337cc2e172097d9c38e7d | |
parent | 5110890cbfa0c783cb727d6a2fbf36ce8560f9a5 (diff) |
MIPS: Oceton: Fix build error.
commit 39205750efa6d335fac4f9bcd32b49c7e71c12b7 upstream.
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | arch/mips/cavium-octeon/setup.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c index 1e1e18c5a534..2a75ff249e71 100644 --- a/arch/mips/cavium-octeon/setup.c +++ b/arch/mips/cavium-octeon/setup.c | |||
@@ -7,6 +7,7 @@ | |||
7 | * Copyright (C) 2008, 2009 Wind River Systems | 7 | * Copyright (C) 2008, 2009 Wind River Systems |
8 | * written by Ralf Baechle <ralf@linux-mips.org> | 8 | * written by Ralf Baechle <ralf@linux-mips.org> |
9 | */ | 9 | */ |
10 | #include <linux/compiler.h> | ||
10 | #include <linux/init.h> | 11 | #include <linux/init.h> |
11 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
12 | #include <linux/console.h> | 13 | #include <linux/console.h> |
@@ -712,7 +713,7 @@ void __init prom_init(void) | |||
712 | if (cvmx_read_csr(CVMX_L2D_FUS3) & (3ull << 34)) { | 713 | if (cvmx_read_csr(CVMX_L2D_FUS3) & (3ull << 34)) { |
713 | pr_info("Skipping L2 locking due to reduced L2 cache size\n"); | 714 | pr_info("Skipping L2 locking due to reduced L2 cache size\n"); |
714 | } else { | 715 | } else { |
715 | uint32_t ebase = read_c0_ebase() & 0x3ffff000; | 716 | uint32_t __maybe_unused ebase = read_c0_ebase() & 0x3ffff000; |
716 | #ifdef CONFIG_CAVIUM_OCTEON_LOCK_L2_TLB | 717 | #ifdef CONFIG_CAVIUM_OCTEON_LOCK_L2_TLB |
717 | /* TLB refill */ | 718 | /* TLB refill */ |
718 | cvmx_l2c_lock_mem_region(ebase, 0x100); | 719 | cvmx_l2c_lock_mem_region(ebase, 0x100); |