Merge commit 'v2.6.27-rc5' into tip/oprofile

Conflicts:
	arch/x86/oprofile/nmi_int.c

1 files changed, 3 insertions, 1 deletions

diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
index 56372ecf1690..dfc0197905ca 100644
--- a/fs/binfmt_flat.c
+++ b/fs/binfmt_flat.c
@@ -914,7 +914,9 @@ static int load_flat_binary(struct linux_binprm * bprm, struct pt_regs * regs)
         /* Stash our initial stack pointer into the mm structure */
         current->mm->start_stack = (unsigned long )sp;
 
-        
+#ifdef FLAT_PLAT_INIT
+        FLAT_PLAT_INIT(regs);
+#endif
         DBG_FLT("start_thread(regs=0x%x, entry=0x%x, start_stack=0x%x)\n",
                 (int)regs, (int)start_addr, (int)current->mm->start_stack);