summaryrefslogtreecommitdiff
path: root/arch/arm/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-12-07 03:12:39 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2019-12-07 03:12:39 +0300
commiteea2d5da29e396b6cc1fb35e36bcbf5f57731015 (patch)
tree4e31d0e6aef22ef7b0b17c8776d5dc59e8e257b9 /arch/arm/include
parent347f56fb389012e8ba7b391d35d109eb16773e3b (diff)
parent04bb96427d4ee33fbdf15648ddf578c6ba1aef54 (diff)
downloadlinux-eea2d5da29e396b6cc1fb35e36bcbf5f57731015.tar.xz
Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King: - fix CPU topology setup for SCHED_MC case - fix VDSO regression * tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm: ARM: 8947/1: Fix __arch_get_hw_counter() access to CNTVCT ARM: 8943/1: Fix topology setup in case of CPU hotplug for CONFIG_SCHED_MC
Diffstat (limited to 'arch/arm/include')
-rw-r--r--arch/arm/include/asm/vdso/gettimeofday.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/include/asm/vdso/gettimeofday.h b/arch/arm/include/asm/vdso/gettimeofday.h
index 5b879ae7afc1..0ad2429c324f 100644
--- a/arch/arm/include/asm/vdso/gettimeofday.h
+++ b/arch/arm/include/asm/vdso/gettimeofday.h
@@ -75,6 +75,9 @@ static __always_inline u64 __arch_get_hw_counter(int clock_mode)
#ifdef CONFIG_ARM_ARCH_TIMER
u64 cycle_now;
+ if (!clock_mode)
+ return -EINVAL;
+
isb();
cycle_now = read_sysreg(CNTVCT);