Merge branch 'arch-arm64' into no-rebases

1 files changed, 8 insertions, 20 deletions

diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c
index bf615e212c6c..8a5f3341861e 100644
--- a/arch/arm64/kernel/process.c
+++ b/arch/arm64/kernel/process.c
@@ -246,14 +246,20 @@ int copy_thread(unsigned long clone_flags, unsigned long stack_start,
                 *childregs = *regs;
                 childregs->regs[0] = 0;
                 if (is_compat_thread(task_thread_info(p))) {
-                        childregs->compat_sp = stack_start;
+                        if (stack_start)
+                                childregs->compat_sp = stack_start;
                 } else {
                         /*
                          * Read the current TLS pointer from tpidr_el0 as it may be
                          * out-of-sync with the saved value.
                          */
                         asm("mrs %0, tpidr_el0" : "=r" (tls));
-                        childregs->sp = stack_start;
+                        if (stack_start) {
+                                /* 16-byte aligned stack mandatory on AArch64 */
+                                if (stack_start & 15)
+                                        return -EINVAL;
+                                childregs->sp = stack_start;
+                        }
                 }
                 /*
                  * If a TLS pointer was passed to clone (4th argument), use it
@@ -317,24 +323,6 @@ struct task_struct *__switch_to(struct task_struct *prev,
         return last;
 }
 
-/*
- * Fill in the task's elfregs structure for a core dump.
- */
-int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs)
-{
-        elf_core_copy_regs(elfregs, task_pt_regs(t));
-        return 1;
-}
-
-/*
- * fill in the fpe structure for a core dump...
- */
-int dump_fpu (struct pt_regs *regs, struct user_fp *fp)
-{
-        return 0;
-}
-EXPORT_SYMBOL(dump_fpu);
-
 unsigned long get_wchan(struct task_struct *p)
 {
         struct stackframe frame;