Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp1149525yba; Thu, 4 Apr 2019 05:21:08 -0700 (PDT) X-Google-Smtp-Source: APXvYqzkf5YIkCN54mVzifbIzDOt7J/wMQPIu6m5gN1/aEfa2hj20obCXgQERdDjtKv28xeIBuKK X-Received: by 2002:a17:902:380c:: with SMTP id l12mr5844590plc.238.1554380468441; Thu, 04 Apr 2019 05:21:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554380468; cv=none; d=google.com; s=arc-20160816; b=T+VxVTtPOMV9WS/DDEdruHTCR4W2x/vuZfOGP53nZDPLqvF2L7pTYEBLDZBM8sE04J wp5JCrzFc+xj+nJoZ9eH4Cjx0x3ApW5wZgjYrALfCUIMn34hwXITB3sw3vz+dr9V3EmQ 4kV5shoWn2gLw1yUyuiOPwM92hLPY74mX7jbaKkOGAGB5x+9bKLe1z62HTpwdeWG+6aI QO9F31t7ZcDLw8Fybl6ylv7D2ugeNsaA/Z42Q+lPHOVvNyBOY1Y725CXZkkvkaFXgeZ2 UYoyf54nm9P2p5/wY8LNnf3hwLrJPqqmxXjdej9UI41cTb0wq1pE6Z35lixX2n7yEk4H jaVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:cc:to:subject:from:message-id :dkim-signature; bh=qVAsrHjgcFhyoqX0iHv0EYygZp1BM3I6QKY+IS8H7mA=; b=QoWoZ63buP7l96W67Ll5JRbj29TdaQPTHYt6Vm7yLr339F5M61Pfif3KuuoR1QS2Rj VMGhjhH/IxV8+V0TkM0XxCTaP+LwLTVEYTUHKqJgO7lBSr22JAoOqApbNhMkreN8C/c2 aqpaHCi8TtQ5wSBkz+Fp8/KOoT4RKHIKkTZNY9/SbkF93fTpWeW3yROVuKBbM+rIOlmf IWifBH0rxgf0yHG2PiZXIxcTzfLoYOSi10CUcABV9kvBba/4LqCDdRJd1KidTX+cbKUJ IoqOEPDsn24rOSf77m/LoVhMpgSa9sxQ3HtNsZdnQ84pJO69hUE2scAjGyd9SMQqcdyP GSew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=M5Pxf4lV; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z4si15643134plk.385.2019.04.04.05.20.53; Thu, 04 Apr 2019 05:21:08 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=M5Pxf4lV; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729134AbfDDMUJ (ORCPT + 99 others); Thu, 4 Apr 2019 08:20:09 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:38109 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727039AbfDDMUJ (ORCPT ); Thu, 4 Apr 2019 08:20:09 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 44Zhps1vMKz9v0gQ; Thu, 4 Apr 2019 14:20:05 +0200 (CEST) Authentication-Results: localhost; dkim=pass reason="1024-bit key; insecure key" header.d=c-s.fr header.i=@c-s.fr header.b=M5Pxf4lV; dkim-adsp=pass; dkim-atps=neutral X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id lvE3JP5egYrE; Thu, 4 Apr 2019 14:20:05 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 44Zhps0bWfz9v0gP; Thu, 4 Apr 2019 14:20:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1554380405; bh=qVAsrHjgcFhyoqX0iHv0EYygZp1BM3I6QKY+IS8H7mA=; h=From:Subject:To:Cc:Date:From; b=M5Pxf4lVxJCK7gy+lp6kuokyNnDe49B9TFT4Odp3Fa8Up6CE/gdx1AOCrz2fIxcwD xjgGmffz1Snavb6TXa9fFYzwfXcnQ9Z6HHCw6fcrR00lmDsseaUyxkv4IFdYABckWN 47Lm/19pVFz8EypeknfK9C8S5o8PXshdjg2gSaB0= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 620278B920; Thu, 4 Apr 2019 14:20:06 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id HK5_7w3khueB; Thu, 4 Apr 2019 14:20:06 +0200 (CEST) Received: from po16846vm.idsi0.si.c-s.fr (unknown [192.168.204.43]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 07EF58B917; Thu, 4 Apr 2019 14:20:06 +0200 (CEST) Received: by po16846vm.idsi0.si.c-s.fr (Postfix, from userid 0) id B1D8166280; Thu, 4 Apr 2019 12:20:05 +0000 (UTC) Message-Id: <0d8c9cb7fb43bde8663333bb6a69d16380a219a5.1554380255.git.christophe.leroy@c-s.fr> From: Christophe Leroy Subject: [PATCH] powerpc/vdso32: fix CLOCK_MONOTONIC on PPC64 To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Christian Zigotzky Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Thu, 4 Apr 2019 12:20:05 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit b5b4453e7912 ("powerpc/vdso64: Fix CLOCK_MONOTONIC inconsistencies across Y2038") changed the type of wtom_clock_sec to s64 on PPC64. Therefore, VDSO32 needs to read it with a 4 bytes shift in order to retrieve the lower part of it. Fixes: b5b4453e7912 ("powerpc/vdso64: Fix CLOCK_MONOTONIC inconsistencies across Y2038") Reported-by: Christian Zigotzky Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/vdso32/gettimeofday.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/kernel/vdso32/gettimeofday.S b/arch/powerpc/kernel/vdso32/gettimeofday.S index 1e0bc5955a40..afd516b572f8 100644 --- a/arch/powerpc/kernel/vdso32/gettimeofday.S +++ b/arch/powerpc/kernel/vdso32/gettimeofday.S @@ -98,7 +98,7 @@ V_FUNCTION_BEGIN(__kernel_clock_gettime) * can be used, r7 contains NSEC_PER_SEC. */ - lwz r5,WTOM_CLOCK_SEC(r9) + lwz r5,(WTOM_CLOCK_SEC+LOPART)(r9) lwz r6,WTOM_CLOCK_NSEC(r9) /* We now have our offset in r5,r6. We create a fake dependency -- 2.13.3