summaryrefslogtreecommitdiff
path: root/libre/linux-libre/0010-Revert-ARM-8947-1-Fix-__arch_get_hw_counter-access-t.patch
diff options
context:
space:
mode:
Diffstat (limited to 'libre/linux-libre/0010-Revert-ARM-8947-1-Fix-__arch_get_hw_counter-access-t.patch')
-rw-r--r--libre/linux-libre/0010-Revert-ARM-8947-1-Fix-__arch_get_hw_counter-access-t.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/libre/linux-libre/0010-Revert-ARM-8947-1-Fix-__arch_get_hw_counter-access-t.patch b/libre/linux-libre/0010-Revert-ARM-8947-1-Fix-__arch_get_hw_counter-access-t.patch
new file mode 100644
index 000000000..8f3349acc
--- /dev/null
+++ b/libre/linux-libre/0010-Revert-ARM-8947-1-Fix-__arch_get_hw_counter-access-t.patch
@@ -0,0 +1,28 @@
+From d8639dab6b5256a2f409da50a6ce73b9502a6823 Mon Sep 17 00:00:00 2001
+From: Kevin Mihelich <kevin@archlinuxarm.org>
+Date: Sun, 2 Feb 2020 18:38:22 -0700
+Subject: [PATCH 10/10] Revert "ARM: 8947/1: Fix __arch_get_hw_counter() access
+ to CNTVCT"
+
+This reverts commit 04bb96427d4ee33fbdf15648ddf578c6ba1aef54.
+---
+ arch/arm/include/asm/vdso/gettimeofday.h | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/arch/arm/include/asm/vdso/gettimeofday.h b/arch/arm/include/asm/vdso/gettimeofday.h
+index 0ad2429c324f..5b879ae7afc1 100644
+--- a/arch/arm/include/asm/vdso/gettimeofday.h
++++ b/arch/arm/include/asm/vdso/gettimeofday.h
+@@ -75,9 +75,6 @@ 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);
+
+--
+2.25.0
+