From: Ralf Baechle <ralf@linux-mips.org>
Date: Thu, 6 Sep 2012 09:29:53 +0000 (+0200)
Subject: MIPS: Highmem: Fix build error if CONFIG_DEBUG_HIGHMEM is disabled
X-Git-Tag: v3.8-rc1~109^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b99fbc10df4fc616908aa0504cba125acf9b4e48;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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>
---

diff --git a/arch/mips/mm/highmem.c b/arch/mips/mm/highmem.c
index aff5705..da815d2 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();