Merge commit '6ba1bc826d160fe4f32bcb188687dcca4bdfaf3d' into arch-arm64

Backmerge from mainline commit that introduced a trivial conflict in
arch/arm64/kernel/process.c - a bunch of functions removed next to the
place where kernel_thread() used to be.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/arm64/include/asm/processor.h
Simple merge

diff --cc arch/arm64/kernel/process.c
index f82987a784af8282f0740d207a309df787fb28dc,e04cebdbb47fc5a82ae6042169b098b8fae13d54..8a5f3341861e579bd7434393b23b82b6291bb19a
--- 1/arch/arm64/kernel/process.c
--- 2/arch/arm64/kernel/process.c
+++ b/arch/arm64/kernel/process.c
@@@ -323,24 -309,43 +323,6 @@@ struct task_struct *__switch_to(struct 
        return last;
  }
  
--/*
-  * Fill in the task's elfregs structure for a core dump.
 - * Shuffle the argument into the correct register before calling the
 - * thread function.  x1 is the thread argument, x2 is the pointer to
 - * the thread function, and x3 points to the exit function.
-- */
- int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs)
- {
-       elf_core_copy_regs(elfregs, task_pt_regs(t));
-       return 1;
- }
 -extern void kernel_thread_helper(void);
 -asm(  ".section .text\n"
 -"     .align\n"
 -"     .type   kernel_thread_helper, #function\n"
 -"kernel_thread_helper:\n"
 -"     mov     x0, x1\n"
 -"     mov     x30, x3\n"
 -"     br      x2\n"
 -"     .size   kernel_thread_helper, . - kernel_thread_helper\n"
 -"     .previous");
 -
 -#define kernel_thread_exit    do_exit
--
--/*
-  * fill in the fpe structure for a core dump...
 - * Create a kernel thread.
-- */
- int dump_fpu (struct pt_regs *regs, struct user_fp *fp)
 -pid_t kernel_thread(int (*fn)(void *), void *arg, unsigned long flags)
--{
-       return 0;
 -      struct pt_regs regs;
 -
 -      memset(&regs, 0, sizeof(regs));
 -
 -      regs.regs[1] = (unsigned long)arg;
 -      regs.regs[2] = (unsigned long)fn;
 -      regs.regs[3] = (unsigned long)kernel_thread_exit;
 -      regs.pc = (unsigned long)kernel_thread_helper;
 -      regs.pstate = PSR_MODE_EL1h;
 -
 -      return do_fork(flags|CLONE_VM|CLONE_UNTRACED, 0, &regs, 0, NULL, NULL);
--}
- EXPORT_SYMBOL(dump_fpu);
 -EXPORT_SYMBOL(kernel_thread);
--
  unsigned long get_wchan(struct task_struct *p)
  {
        struct stackframe frame;