aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesper Nilsson <jespern@axis.com>2015-01-15 11:54:00 -0500
committerJesper Nilsson <jespern@axis.com>2015-01-29 04:10:08 -0500
commit134115cd609d53c25fef99dba75857961a63d8a7 (patch)
tree1b04916481c19030b0d1809b272fc5199d08b2e6
parent4806f8bb8d58821bd70c32126813b99962ad185a (diff)
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>
-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:
217 /* User mode accesses just cause a SIGSEGV */ 217 /* User mode accesses just cause a SIGSEGV */
218 218
219 if (user_mode(regs)) { 219 if (user_mode(regs)) {
220#ifdef CONFIG_NO_SEGFAULT_TERMINATION
221 DECLARE_WAIT_QUEUE_HEAD(wq);
222#endif
220 printk(KERN_NOTICE "%s (pid %d) segfaults for page " 223 printk(KERN_NOTICE "%s (pid %d) segfaults for page "
221 "address %08lx at pc %08lx\n", 224 "address %08lx at pc %08lx\n",
222 tsk->comm, tsk->pid, 225 tsk->comm, tsk->pid,
@@ -227,7 +230,6 @@ retry:
227 show_registers(regs); 230 show_registers(regs);
228 231
229#ifdef CONFIG_NO_SEGFAULT_TERMINATION 232#ifdef CONFIG_NO_SEGFAULT_TERMINATION
230 DECLARE_WAIT_QUEUE_HEAD(wq);
231 wait_event_interruptible(wq, 0 == 1); 233 wait_event_interruptible(wq, 0 == 1);
232#else 234#else
233 info.si_signo = SIGSEGV; 235 info.si_signo = SIGSEGV;