diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-23 20:04:33 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-23 20:04:33 -0700 |
| commit | 329f0a8a35a664fb33f58f10538f5440ee19c54e (patch) | |
| tree | 270e7764e6fe54c982626bd2af294cedf4afbc5f /arch/x86/include/asm/kprobes.h | |
| parent | a5fa2660d787d8416f426cd622778a5d8851ac36 (diff) | |
| parent | 520eccdfe187591a51ea9ab4c1a024ae4d0f68d9 (diff) | |
| download | linux-329f0a8a35a664fb33f58f10538f5440ee19c54e.tar.gz linux-329f0a8a35a664fb33f58f10538f5440ee19c54e.tar.bz2 linux-329f0a8a35a664fb33f58f10538f5440ee19c54e.zip | |
Merge 4.13-rc2 into tty-next
We want the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/include/asm/kprobes.h')
| -rw-r--r-- | arch/x86/include/asm/kprobes.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h index 34b984c60790..6cf65437b5e5 100644 --- a/arch/x86/include/asm/kprobes.h +++ b/arch/x86/include/asm/kprobes.h @@ -52,10 +52,10 @@ typedef u8 kprobe_opcode_t; #define flush_insn_slot(p) do { } while (0) /* optinsn template addresses */ -extern __visible kprobe_opcode_t optprobe_template_entry; -extern __visible kprobe_opcode_t optprobe_template_val; -extern __visible kprobe_opcode_t optprobe_template_call; -extern __visible kprobe_opcode_t optprobe_template_end; +extern __visible kprobe_opcode_t optprobe_template_entry[]; +extern __visible kprobe_opcode_t optprobe_template_val[]; +extern __visible kprobe_opcode_t optprobe_template_call[]; +extern __visible kprobe_opcode_t optprobe_template_end[]; #define MAX_OPTIMIZED_LENGTH (MAX_INSN_SIZE + RELATIVE_ADDR_SIZE) #define MAX_OPTINSN_SIZE \ (((unsigned long)&optprobe_template_end - \ |