Merge branch 'misc' into for-linus

Conflicts:
	arch/arm/kernel/ptrace.c

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/kernel/ptrace.c
index 9650c143afc115fe82c2ccd5fdecad6ef02116e0,50d5a7d1da3656128435ad06b63a47d1e0f95bc1..14e38261cd31db9d852db2eb0b8046251a04613d
--- 1/arch/arm/kernel/ptrace.c
--- 2/arch/arm/kernel/ptrace.c
+++ b/arch/arm/kernel/ptrace.c
@@@ -921,28 -935,11 +922,18 @@@ asmlinkage int syscall_trace(int why, s
  
        current_thread_info()->syscall = scno;
  
-       /* the 0x80 provides a way for the tracing parent to distinguish
-          between a syscall stop and SIGTRAP delivery */
-       ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
-                                ? 0x80 : 0));
-       /*
-        * this isn't the same as continuing with a signal, but it will do
-        * for normal use.  strace only continues with a signal if the
-        * stopping signal is not SIGTRAP.  -brl
-        */
-       if (current->exit_code) {
-               send_sig(current->exit_code, current, 1);
-               current->exit_code = 0;
-       }
 +      /*
 +       * IP is used to denote syscall entry/exit:
 +       * IP = 0 -> entry, =1 -> exit
 +       */
 +      ip = regs->ARM_ip;
 +      regs->ARM_ip = why;
 +
+       if (why)
+               tracehook_report_syscall_exit(regs, 0);
+       else if (tracehook_report_syscall_entry(regs))
+               current_thread_info()->syscall = -1;
+ 
        regs->ARM_ip = ip;
  
        return current_thread_info()->syscall;

diff --cc arch/arm/kernel/signal.c
Simple merge

diff --cc arch/arm/vfp/vfpmodule.c
index b0197b2c857d12588d1d77a026e9f6a60c38b22d,a8f541b8fe9f6cb9cff4b9b88b7a15bb204f9bce..586961929e964ce63d70987c0c7c36184aff4db8
--- 1/arch/arm/vfp/vfpmodule.c
--- 2/arch/arm/vfp/vfpmodule.c
+++ b/arch/arm/vfp/vfpmodule.c
@@@ -672,8 -579,10 +672,8 @@@ static int __init vfp_init(void
        } else {
                hotcpu_notifier(vfp_hotplug, 0);
  
 -              smp_call_function(vfp_enable, NULL, 1);
 -
                VFP_arch = (vfpsid & FPSID_ARCH_MASK) >> FPSID_ARCH_BIT;  /* Extract the architecture version */
-               printk("implementor %02x architecture %d part %02x variant %x rev %x\n",
+               pr_cont("implementor %02x architecture %d part %02x variant %x rev %x\n",
                        (vfpsid & FPSID_IMPLEMENTER_MASK) >> FPSID_IMPLEMENTER_BIT,
                        (vfpsid & FPSID_ARCH_MASK) >> FPSID_ARCH_BIT,
                        (vfpsid & FPSID_PART_MASK) >> FPSID_PART_BIT,