summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2012-09-06 11:29:53 +0200
committerRalf Baechle <ralf@linux-mips.org>2012-12-13 18:15:27 +0100
commitb99fbc10df4fc616908aa0504cba125acf9b4e48 (patch)
tree7b49b180a11e23824566792cea52be0476bfd4c7
parenta16dad7763420a3b46cff1e703a9070827796cfc (diff)
downloadblackbird-obmc-linux-b99fbc10df4fc616908aa0504cba125acf9b4e48.tar.gz
blackbird-obmc-linux-b99fbc10df4fc616908aa0504cba125acf9b4e48.zip
MIPS: Highmem: Fix build error if CONFIG_DEBUG_HIGHMEM is disabled
CC arch/mips/mm/highmem.o /home/ralf/src/linux/linux-mips/arch/mips/mm/highmem.c: In function ‘__kunmap_atomic’: /home/ralf/src/linux/linux-mips/arch/mips/mm/highmem.c:70:6: error: variable ‘type’ set but not used [-Werror=unused-but-set-variable] cc1: all warnings being treated as errors This warning exists in gcc 4.6.0 and newer. Kernels 2.6.40 and newer use -Wunused-but-set-variable to suppress it. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/mm/highmem.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/mm/highmem.c b/arch/mips/mm/highmem.c
index aff57057a949..da815d295239 100644
--- a/arch/mips/mm/highmem.c
+++ b/arch/mips/mm/highmem.c
@@ -1,3 +1,4 @@
+#include <linux/compiler.h>
#include <linux/module.h>
#include <linux/highmem.h>
#include <linux/sched.h>
@@ -67,7 +68,7 @@ EXPORT_SYMBOL(kmap_atomic);
void __kunmap_atomic(void *kvaddr)
{
unsigned long vaddr = (unsigned long) kvaddr & PAGE_MASK;
- int type;
+ int type __maybe_unused;
if (vaddr < FIXADDR_START) { // FIXME
pagefault_enable();
OpenPOWER on IntegriCloud