diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-16 15:39:52 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-16 15:39:52 -0700 |
commit | 3d135f522476a815699dfbefb685de50bc5c12d6 (patch) | |
tree | 24d2a9681b4296c6828d569b643cf966021b409b /arch/arm/kernel | |
parent | fb33c6510d5595144d585aa194d377cf74d31911 (diff) | |
parent | 89604523a76eb3e13014b2bdab7f8870becee284 (diff) | |
download | linux-stable-3d135f522476a815699dfbefb685de50bc5c12d6.tar.gz linux-stable-3d135f522476a815699dfbefb685de50bc5c12d6.tar.bz2 linux-stable-3d135f522476a815699dfbefb685de50bc5c12d6.zip |
Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
- allow use of ARMv8 arch timer in 32-bit VDSO
- rename missed .fixup section
- fix kbuild issue with stack protector GCC plugin
* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
ARM: 8961/2: Fix Kbuild issue caused by per-task stack protector GCC plugin
ARM: 8958/1: rename missed uaccess .fixup section
ARM: 8957/1: VDSO: Match ARMv8 timer in cntvct_functional()
Diffstat (limited to 'arch/arm/kernel')
-rw-r--r-- | arch/arm/kernel/vdso.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/kernel/vdso.c b/arch/arm/kernel/vdso.c index c89ac1b9d28b..e0330a25e1c6 100644 --- a/arch/arm/kernel/vdso.c +++ b/arch/arm/kernel/vdso.c @@ -95,6 +95,8 @@ static bool __init cntvct_functional(void) */ np = of_find_compatible_node(NULL, NULL, "arm,armv7-timer"); if (!np) + np = of_find_compatible_node(NULL, NULL, "arm,armv8-timer"); + if (!np) goto out_put; if (of_property_read_bool(np, "arm,cpu-registers-not-fw-configured")) |