diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-07-19 07:55:00 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-07-19 07:55:00 (GMT) |
| commit | 9bb15425c3bc82b501134ed7d998811dc0c05bf5 (patch) | |
| tree | e2e6059d117f530d0f4ae0df98fed30d62f4e902 /arch/x86/include | |
| parent | 5a9821321e0a61674fd5c4b5a9e95007d0e7e052 (diff) | |
| parent | 51b2c07b22261f19188d9a9071943d60a067481c (diff) | |
| download | linux-fsl-qoriq-9bb15425c3bc82b501134ed7d998811dc0c05bf5.tar.xz | |
Merge branch 'x86/jumplabel' into perf/core
Upcoming kprobes patches rely on the int3 code-patching machinery introduced by:
fd4363fff3d9 x86: Introduce int3 (breakpoint)-based instruction patching
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/alternative.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h index 58ed6d9..3abf8dd 100644 --- a/arch/x86/include/asm/alternative.h +++ b/arch/x86/include/asm/alternative.h @@ -233,6 +233,7 @@ struct text_poke_param { }; extern void *text_poke(void *addr, const void *opcode, size_t len); +extern void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler); extern void *text_poke_smp(void *addr, const void *opcode, size_t len); extern void text_poke_smp_batch(struct text_poke_param *params, int n); |