Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze

Pull microblaze changes from Michal Simek.

* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Setup correct pointer to TLS area
  microblaze: Add TLS support to sys_clone
  microblaze: ftrace: Pass the first calling instruction for dynamic ftrace
  microblaze: Port OOM changes to do_page_fault
  microblaze: Do not select GENERIC_GPIO by default

5 files changed, 39 insertions, 11 deletions

diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 83460468998d..0bf44231aaf9 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -52,7 +52,7 @@ config GENERIC_CALIBRATE_DELAY
         def_bool y
 
 config GENERIC_GPIO
-        def_bool y
+        bool
 
 config GENERIC_CSUM
         def_bool y
diff --git a/arch/microblaze/kernel/entry.S b/arch/microblaze/kernel/entry.S
index daff9e5e4a1f..03f7b8ce6b6b 100644
--- a/arch/microblaze/kernel/entry.S
+++ b/arch/microblaze/kernel/entry.S
@@ -492,10 +492,11 @@ C_ENTRY(sys_clone):
         bnei    r6, 1f;                 /* See if child SP arg (arg 1) is 0. */
         lwi     r6, r1, PT_R1;  /* If so, use paret's stack ptr */
 1:      addik   r7, r1, 0;                      /* Arg 2: parent context */
-        add     r8, r0, r0;                     /* Arg 3: (unused) */
-        add     r9, r0, r0;                     /* Arg 4: (unused) */
+        lwi     r9, r1, PT_R8;          /* parent tid.  */
+        lwi     r10, r1, PT_R9;         /* child tid.  */
+        /* do_fork will pick up TLS from regs->r10.  */
         brid    do_fork         /* Do real work (tail-call) */
-        add     r10, r0, r0;                    /* Arg 5: (unused) */
+        add     r8, r0, r0;             /* Arg 3: (unused) */
 
 C_ENTRY(sys_execve):
         brid    microblaze_execve;      /* Do real work (tail-call).*/
diff --git a/arch/microblaze/kernel/mcount.S b/arch/microblaze/kernel/mcount.S
index e7eaa7a8cbd3..fc1e1322ce4c 100644
--- a/arch/microblaze/kernel/mcount.S
+++ b/arch/microblaze/kernel/mcount.S
@@ -138,7 +138,7 @@ NOALIGN_ENTRY(ftrace_call)
 #endif /* CONFIG_DYNAMIC_FTRACE */
 /* static normal trace */
         lwi     r6, r1, 120; /* MS: load parent addr */
-        addik   r5, r15, 0; /* MS: load current function addr */
+        addik   r5, r15, -4; /* MS: load current function addr */
         /* MS: here is dependency on previous code */
         brald   r15, r20; /* MS: jump to ftrace handler */
         nop;
diff --git a/arch/microblaze/kernel/process.c b/arch/microblaze/kernel/process.c
index 883b92789cdf..1944e00f07e1 100644
--- a/arch/microblaze/kernel/process.c
+++ b/arch/microblaze/kernel/process.c
@@ -182,8 +182,12 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
 #endif
         ti->cpu_context.r15 = (unsigned long)ret_from_fork - 8;
 
+        /*
+         *  r21 is the thread reg, r10 is 6th arg to clone
+         *  which contains TLS area
+         */
         if (clone_flags & CLONE_SETTLS)
-                ;
+                childregs->r21 = childregs->r10;
 
         return 0;
 }
diff --git a/arch/microblaze/mm/fault.c b/arch/microblaze/mm/fault.c
index c38a265846de..eb365d6795fa 100644
--- a/arch/microblaze/mm/fault.c
+++ b/arch/microblaze/mm/fault.c
@@ -92,6 +92,8 @@ void do_page_fault(struct pt_regs *regs, unsigned long address,
         int code = SEGV_MAPERR;
         int is_write = error_code & ESR_S;
         int fault;
+        unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |
+                                         (is_write ? FAULT_FLAG_WRITE : 0);
 
         regs->ear = address;
         regs->esr = error_code;
@@ -138,6 +140,7 @@ void do_page_fault(struct pt_regs *regs, unsigned long address,
                 if (kernel_mode(regs) && !search_exception_tables(regs->pc))
                         goto bad_area_nosemaphore;
 
+retry:
                 down_read(&mm->mmap_sem);
         }
 
@@ -210,7 +213,11 @@ good_area:
          * make sure we exit gracefully rather than endlessly redo
          * the fault.
          */
-        fault = handle_mm_fault(mm, vma, address, is_write ? FAULT_FLAG_WRITE : 0);
+        fault = handle_mm_fault(mm, vma, address, flags);
+
+        if ((fault & VM_FAULT_RETRY) && fatal_signal_pending(current))
+                return;
+
         if (unlikely(fault & VM_FAULT_ERROR)) {
                 if (fault & VM_FAULT_OOM)
                         goto out_of_memory;
@@ -218,11 +225,27 @@ good_area:
                         goto do_sigbus;
                 BUG();
         }
-        if (unlikely(fault & VM_FAULT_MAJOR))
-                current->maj_flt++;
-        else
-                current->min_flt++;
+
+        if (flags & FAULT_FLAG_ALLOW_RETRY) {
+                if (unlikely(fault & VM_FAULT_MAJOR))
+                        current->maj_flt++;
+                else
+                        current->min_flt++;
+                if (fault & VM_FAULT_RETRY) {
+                        flags &= ~FAULT_FLAG_ALLOW_RETRY;
+
+                        /*
+                         * No need to up_read(&mm->mmap_sem) as we would
+                         * have already released it in __lock_page_or_retry
+                         * in mm/filemap.c.
+                         */
+
+                        goto retry;
+                }
+        }
+
         up_read(&mm->mmap_sem);
+
         /*
          * keep track of tlb+htab misses that are good addrs but
          * just need pte's created via handle_mm_fault()