summaryrefslogtreecommitdiffstats
path: root/arch/cris
diff options
context:
space:
mode:
authorJesper Nilsson <jespern@axis.com>2015-01-15 17:54:00 +0100
committerJesper Nilsson <jespern@axis.com>2015-01-29 10:10:08 +0100
commit134115cd609d53c25fef99dba75857961a63d8a7 (patch)
tree1b04916481c19030b0d1809b272fc5199d08b2e6 /arch/cris
parent4806f8bb8d58821bd70c32126813b99962ad185a (diff)
downloadlinux-134115cd609d53c25fef99dba75857961a63d8a7.tar.bz2
CRIS: Avoid warning in cris mm/fault.c
Move declaration of waitqueue to beginning of block, avoids warning about mixing declarations and code. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Diffstat (limited to 'arch/cris')
-rw-r--r--arch/cris/mm/fault.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/cris/mm/fault.c b/arch/cris/mm/fault.c
index 1790f22e71a2..46a6ade5d0e4 100644
--- a/arch/cris/mm/fault.c
+++ b/arch/cris/mm/fault.c
@@ -217,6 +217,9 @@ retry:
/* User mode accesses just cause a SIGSEGV */
if (user_mode(regs)) {
+#ifdef CONFIG_NO_SEGFAULT_TERMINATION
+ DECLARE_WAIT_QUEUE_HEAD(wq);
+#endif
printk(KERN_NOTICE "%s (pid %d) segfaults for page "
"address %08lx at pc %08lx\n",
tsk->comm, tsk->pid,
@@ -227,7 +230,6 @@ retry:
show_registers(regs);
#ifdef CONFIG_NO_SEGFAULT_TERMINATION
- DECLARE_WAIT_QUEUE_HEAD(wq);
wait_event_interruptible(wq, 0 == 1);
#else
info.si_signo = SIGSEGV;