diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-18 09:59:28 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-18 09:59:28 -0800 |
| commit | 3ddc14e25e7fef143d35fdd0cad1e8dcf48efaa7 (patch) | |
| tree | d8d6bb055a619ee7a778633379bfa979fa4f259d /arch/arm/probes/kprobes | |
| parent | 10f4902173130fcbb02a69566fefab35fc5f1f30 (diff) | |
| parent | fc67e6f120a388b611d94cc40baf99a5cc56b283 (diff) | |
| download | linux-stable-3ddc14e25e7fef143d35fdd0cad1e8dcf48efaa7.tar.gz linux-stable-3ddc14e25e7fef143d35fdd0cad1e8dcf48efaa7.tar.bz2 linux-stable-3ddc14e25e7fef143d35fdd0cad1e8dcf48efaa7.zip | |
Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
"A few ARM fixes:
- Dietmar Eggemann noticed an issue with IRQ migration during CPU
hotplug stress testing.
- Mathieu Desnoyers noticed that a previous fix broke optimised
kprobes.
- Robin Murphy noticed a case where we were not clearing the dma_ops"
* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
ARM: 8835/1: dma-mapping: Clear DMA ops on teardown
ARM: 8834/1: Fix: kprobes: optimized kprobes illegal instruction
ARM: 8824/1: fix a migrating irq bug when hotplug cpu
Diffstat (limited to 'arch/arm/probes/kprobes')
| -rw-r--r-- | arch/arm/probes/kprobes/opt-arm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/probes/kprobes/opt-arm.c b/arch/arm/probes/kprobes/opt-arm.c index 2c118a6ab358..0dc23fc227ed 100644 --- a/arch/arm/probes/kprobes/opt-arm.c +++ b/arch/arm/probes/kprobes/opt-arm.c @@ -247,7 +247,7 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op, struct kprobe *or } /* Copy arch-dep-instance from template. */ - memcpy(code, (unsigned char *)optprobe_template_entry, + memcpy(code, (unsigned long *)&optprobe_template_entry, TMPL_END_IDX * sizeof(kprobe_opcode_t)); /* Adjust buffer according to instruction. */ |