diff options
| author | Mark Brown <broonie@kernel.org> | 2020-12-04 23:39:45 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-12-04 23:39:45 +0300 |
| commit | 4ecc08b2f51d874f35185724eda769492b60a18d (patch) | |
| tree | f4d9e97304e9ff423fd4efa5193a1b94ebfc5912 /arch/arm64/include/asm/kprobes.h | |
| parent | 0b3355b070434f9901f641aac9000df93e2c96ad (diff) | |
| parent | 0d2bf11a6b3e275a526b8d42d8d4a3a6067cf953 (diff) | |
| download | linux-4ecc08b2f51d874f35185724eda769492b60a18d.tar.xz | |
Merge tag 'auxbus-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core into asoc-5.11
Auxiliary Bus support tag for 5.11-rc1
This is a signed tag for other subsystems to be able to pull in the
auxiliary bus support into their trees for the 5.11-rc1 merge.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm64/include/asm/kprobes.h')
| -rw-r--r-- | arch/arm64/include/asm/kprobes.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/kprobes.h b/arch/arm64/include/asm/kprobes.h index 97e511d645a2..8699ce30f587 100644 --- a/arch/arm64/include/asm/kprobes.h +++ b/arch/arm64/include/asm/kprobes.h @@ -16,7 +16,7 @@ #include <linux/percpu.h> #define __ARCH_WANT_KPROBES_INSN_SLOT -#define MAX_INSN_SIZE 1 +#define MAX_INSN_SIZE 2 #define flush_insn_slot(p) do { } while (0) #define kretprobe_blacklist_size 0 |