Merge remote-tracking branch 'asoc/fix/rsnd' into asoc-linus

[karo-tx-linux.git] / arch / cris / mm / fault.c

diff --git a/arch/cris/mm/fault.c b/arch/cris/mm/fault.c
index 2686a7aa8ec82c50f29592840185b519522c53a7..83f12f2ed9e31b8705ed4f8f5ec1c4cbd8822fb4 100644 (file)
--- a/arch/cris/mm/fault.c
+++ b/arch/cris/mm/fault.c
@@ -219,6 +219,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,
@@ -229,7 +232,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;