Ingo, please pull from

  git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc uprobes/core

Based on tip:perf/uprobes


Denys found another nasty old bug in uprobes/x86: div, mul, shifts with
count in CL, and cmpxchg are not handled correctly.

Plus a couple of other minor fixes. Nobody acked the changes in x86/traps,
hopefully they are simple enough, and I believe that they make sense anyway
and allow to do more cleanups.

Denys Vlasenko (2):
      uprobes/x86: Simplify rip-relative handling
      uprobes/x86: Fix scratch register selection for rip-relative fixups

Oleg Nesterov (8):
      uprobes: Add mem_cgroup_charge_anon() into uprobe_write_opcode()
      x86/traps: Make math_error() static
      x86/traps: Use SEND_SIG_PRIV instead of force_sig()
      x86/traps: Introduce do_error_trap()
      x86/traps: Introduce fill_trap_info(), simplify DO_ERROR_INFO()
      x86/traps: Shift fill_trap_info() from DO_ERROR_INFO() to do_error_trap()
      x86/traps: Kill DO_ERROR_INFO()
      uprobes/x86: Fix the wrong ->si_addr when xol triggers a trap

 arch/x86/include/asm/traps.h   |    1 -
 arch/x86/include/asm/uprobes.h |    3 -
 arch/x86/kernel/traps.c        |  110 ++++++++++++---------
 arch/x86/kernel/uprobes.c      |  213 ++++++++++++++++++++++++++--------------
 include/linux/uprobes.h        |    4 +
 kernel/events/uprobes.c        |   33 ++++---
 6 files changed, 225 insertions(+), 139 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to