Merge tag 'cris-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris

Pull CRIS changes from Jesper Nilsson.

* tag 'cris-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris:
  CRIS: Whitespace cleanup
  CRIS: macro whitespace fixes in uaccess.h
  CRIS: uaccess: fix sparse errors
  CRISv32: Remove unnecessary KERN_INFO from sync_serial
  CRIS: Fix missing NR_CPUS in menuconfig
  CRISv32: Avoid warning of unused variable
  CRIS: Avoid warning in cris mm/fault.c
  CRIS: Export csum_partial_copy_nocheck

1 files changed, 3 insertions, 1 deletions

diff --git a/arch/cris/mm/fault.c b/arch/cris/mm/fault.c
index 2686a7aa8ec8..83f12f2ed9e3 100644
--- 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;