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

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

diff --combined arch/cris/mm/fault.c
index 2686a7aa8ec82c50f29592840185b519522c53a7,46a6ade5d0e438aaaac68ff651a816b50f7dab13..83f12f2ed9e31b8705ed4f8f5ec1c4cbd8822fb4
--- 1/arch/cris/mm/fault.c
--- 2/arch/cris/mm/fault.c
+++ b/arch/cris/mm/fault.c
@@@ -176,8 -176,6 +176,8 @@@ retry
        if (unlikely(fault & VM_FAULT_ERROR)) {
                if (fault & VM_FAULT_OOM)
                        goto out_of_memory;
 +              else if (fault & VM_FAULT_SIGSEGV)
 +                      goto bad_area;
                else if (fault & VM_FAULT_SIGBUS)
                        goto do_sigbus;
                BUG();
@@@ -219,6 -217,9 +219,9 @@@
        /* 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 -230,6 +232,6 @@@
                        show_registers(regs);
  
  #ifdef CONFIG_NO_SEGFAULT_TERMINATION
-               DECLARE_WAIT_QUEUE_HEAD(wq);
                wait_event_interruptible(wq, 0 == 1);
  #else
                info.si_signo = SIGSEGV;