Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus

[mv-sheeva.git] / arch / mips / kernel / signal.c

diff --git a/arch/mips/kernel/signal.c b/arch/mips/kernel/signal.c
index 5922342bca3991d4b7ab4a9d6f8483fb3e416779..dbbe0ce48d89a4957a349febda33d0934c97d9af 100644 (file)
--- a/arch/mips/kernel/signal.c
+++ b/arch/mips/kernel/signal.c
@@ -84,7 +84,7 @@ static int protected_save_fp_context(struct sigcontext __user *sc)
 
 static int protected_restore_fp_context(struct sigcontext __user *sc)
 {
-       int err, tmp;
+       int err, tmp __maybe_unused;
        while (1) {
                lock_fpu_owner();
                own_fpu_inatomic(0);