Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...

[~andy/linux] / arch / mips / mm / highmem.c

diff --git a/arch/mips/mm/highmem.c b/arch/mips/mm/highmem.c
index aff57057a9495f79ff0eec7cc1623ab89ad19e6d..da815d295239baaaf6e1d1069e2255baa8d75358 100644 (file)
--- 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();