Merge branch 'x86/jumplabel' into perf/core

Browse source

Upcoming kprobes patches rely on the int3 code-patching machinery introduced by:

   fd4363fff3 x86: Introduce int3 (breakpoint)-based instruction patching

Signed-off-by: Ingo Molnar <mingo@kernel.org>

...

This commit is contained in:

Ingo Molnar 2013-07-19 09:55:00 +02:00

parent 5a9821321e 51b2c07b22

commit 9bb15425c3

4 changed files with 122 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

arch/x86/include/asm/alternative.h

View file

106

arch/x86/kernel/alternative.c

View file

16

arch/x86/kernel/jump_label.c

View file

2

kernel/kprobes.c

View file