]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
MIPS: Highmem: Fix build error if CONFIG_DEBUG_HIGHMEM is disabled
authorRalf Baechle <ralf@linux-mips.org>
Thu, 6 Sep 2012 09:29:53 +0000 (11:29 +0200)
committerRalf Baechle <ralf@linux-mips.org>
Thu, 13 Dec 2012 17:15:27 +0000 (18:15 +0100)
  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>
arch/mips/mm/highmem.c

index aff57057a9495f79ff0eec7cc1623ab89ad19e6d..da815d295239baaaf6e1d1069e2255baa8d75358 100644 (file)
@@ -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();