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

3 files changed, 10 insertions, 5 deletions

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;
 }