diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-07-31 09:33:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-07-31 09:33:45 -0700 |
| commit | c1954ca6abdc69a02a768368eb31882e92cf5bfa (patch) | |
| tree | 1138c65f49c19b8e45352645a43cdada944bfbd6 /arch/arm/kernel/vdso.c | |
| parent | ae2911de2eb5dc9ccb88c6502c776a8fbb7acc67 (diff) | |
| parent | 5c6360ee4a0e7f62de34341ad5d3c936f49b391d (diff) | |
Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
- avoid invoking overflow handler for uaccess watchpoints
- fix incorrect clock_gettime64 availability
- fix EFI crash in create_mapping_late()
* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
ARM: 8988/1: mmu: fix crash in EFI calls due to p4d typo in create_mapping_late()
ARM: 8987/1: VDSO: Fix incorrect clock_gettime64
ARM: 8986/1: hw_breakpoint: Don't invoke overflow handler on uaccess watchpoints
Diffstat (limited to 'arch/arm/kernel/vdso.c')
| -rw-r--r-- | arch/arm/kernel/vdso.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kernel/vdso.c b/arch/arm/kernel/vdso.c index 6bfdca4769a7..fddd08a6e063 100644 --- a/arch/arm/kernel/vdso.c +++ b/arch/arm/kernel/vdso.c @@ -184,6 +184,7 @@ static void __init patch_vdso(void *ehdr) if (!cntvct_ok) { vdso_nullpatch_one(&einfo, "__vdso_gettimeofday"); vdso_nullpatch_one(&einfo, "__vdso_clock_gettime"); + vdso_nullpatch_one(&einfo, "__vdso_clock_gettime64"); } } |