Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

diff --cc arch/arm/mm/fault.c
index 56059a5be9a89adaa588d7275beb3362f7d2cc03,54fcddafec155b9a8bb9950c2a63d2f75c7d0af1..9820ad4b80c027514c19a472a3bf785bb22a0202
--- 1/arch/arm/mm/fault.c
--- 2/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@@ -276,12 -274,17 +274,17 @@@ do_page_fault(unsigned long addr, unsig
                local_irq_enable();
  
        /*
 -       * If we're in an interrupt or have no user
 +       * If we're in an interrupt, or have no irqs, or have no user
         * context, we must not take the fault..
         */
 -      if (in_atomic() || !mm)
 +      if (in_atomic() || irqs_disabled() || !mm)
                goto no_context;
  
+       if (user_mode(regs))
+               flags |= FAULT_FLAG_USER;
+       if (fsr & FSR_WRITE)
+               flags |= FAULT_FLAG_WRITE;
+ 
        /*
         * As per x86, we may deadlock here.  However, since the kernel only
         * validly references user space from well defined areas of the code,

diff --cc fs/nfs/inode.c
Simple merge

diff --cc fs/nfs/nfs4proc.c
Simple merge

diff --cc include/linux/mm.h
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc mm/memcontrol.c
Simple merge