[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git-commits-head
Subject:    ARM: 8987/1: VDSO: Fix incorrect clock_gettime64
From:       Linux Kernel Mailing List <linux-kernel () vger ! kernel ! org>
Date:       2020-07-31 16:42:07
Message-ID: git-mailbomb-linux-master-4405bdf3c57ec28d606bdf5325f1167505bfdcd4 () kernel ! org
[Download RAW message or body]

Commit:     4405bdf3c57ec28d606bdf5325f1167505bfdcd4
Parent:     eec13b42d41b0f3339dcf0c4da43734427c68620
Refname:    refs/heads/master
Web:        https://git.kernel.org/torvalds/c/4405bdf3c57ec28d606bdf5325f1167505bfdcd4
Author:     Jaedon Shin <jaedon.shin@gmail.com>
AuthorDate: Thu Jun 18 18:15:30 2020 +0100
Committer:  Russell King <rmk+kernel@armlinux.org.uk>
CommitDate: Tue Jul 21 16:32:55 2020 +0100

    ARM: 8987/1: VDSO: Fix incorrect clock_gettime64
    
    __vdso_*() should be removed and fallback used if CNTCVT is not
    available by cntvct_functional(). __vdso_clock_gettime64 when added
    previous commit is using the incorrect CNTCVT value in that state.
    __vdso_clock_gettime64 is also added to remove it's symbol.
    
    Cc: stable@vger.kernel.org
    Fixes: 74d06efb9c2f ("ARM: 8932/1: Add clock_gettime64 entry point")
    Signed-off-by: Jaedon Shin <jaedon.shin@gmail.com>
    Tested-by: Robin Murphy <robin.mruphy@arm.com>
    Signed-off-by: Robin Murphy <robin.murphy@arm.com>
    Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
---
 arch/arm/kernel/vdso.c | 1 +
 1 file changed, 1 insertion(+)

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");
 	}
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]