Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

Pull ARM updates from Russell King:

 - Refactor VFP code and convert to C code (Ard Biesheuvel)

 - Fix hardware breakpoint single-stepping using bpf_overflow_handler

 - Make SMP stop calls asynchronous allowing panic from irq context to
   work

 - Fix for kernel-doc warnings for locomo

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  Revert part of ae1f8d793a19 ("ARM: 9304/1: add prototype for function called only from asm")
  ARM: 9318/1: locomo: move kernel-doc to prevent warnings
  ARM: 9317/1: kexec: Make smp stop calls asynchronous
  ARM: 9316/1: hw_breakpoint: fix single-stepping when using bpf_overflow_handler
  ARM: entry: Make asm coproc dispatch code NWFPE only
  ARM: iwmmxt: Use undef hook to enable coprocessor for task
  ARM: entry: Disregard Thumb undef exception in coproc dispatch
  ARM: vfp: Use undef hook for handling VFP exceptions
  ARM: kernel: Get rid of thread_info::used_cp[] array
  ARM: vfp: Reimplement VFP exception entry in C code
  ARM: vfp: Remove workaround for Feroceon CPUs
  ARM: vfp: Record VFP bounces as perf emulation faults

diff --combined arch/arm/kernel/ptrace.c
index fef32d7,2b945b9..c421a89
--- 1/arch/arm/kernel/ptrace.c
--- 2/arch/arm/kernel/ptrace.c
+++ b/arch/arm/kernel/ptrace.c
@@@ -584,8 -584,6 +584,6 @@@ static int fpa_set(struct task_struct *
  {
        struct thread_info *thread = task_thread_info(target);
  
-       thread->used_cp[1] = thread->used_cp[2] = 1;
- 
        return user_regset_copyin(&pos, &count, &kbuf, &ubuf,
                &thread->fpstate,
                0, sizeof(struct user_fp));
@@@ -783,9 -781,8 +781,9 @@@ long arch_ptrace(struct task_struct *ch
                        break;
  
                case PTRACE_SET_SYSCALL:
 -                      task_thread_info(child)->abi_syscall = data &
 -                                                      __NR_SYSCALL_MASK;
 +                      if (data != -1)
 +                              data &= __NR_SYSCALL_MASK;
 +                      task_thread_info(child)->abi_syscall = data;
                        ret = 0;
                        break;