From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8CD23C432C3 for ; Thu, 14 Nov 2019 04:38:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 56D82206EC for ; Thu, 14 Nov 2019 04:38:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="TGcBdSMI" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726491AbfKNEiN (ORCPT ); Wed, 13 Nov 2019 23:38:13 -0500 Received: from bilbo.ozlabs.org ([203.11.71.1]:45805 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726489AbfKNEiN (ORCPT ); Wed, 13 Nov 2019 23:38:13 -0500 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 47D7yW21Qbz9s7T; Thu, 14 Nov 2019 15:38:10 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1573706291; bh=P/mByLN+ETEbE7SL3y/9lgK4nCMiQUGm3IeNA1f59No=; h=Date:From:To:Cc:Subject:From; b=TGcBdSMI5oIHykg4FuwaNn9fzgPtmUgLod0dsDYZnQ15h0Tz3Nx7ltrddEOWfIN4o PKEjGveukKn7dd9jY/yuQCuWotcXnZVTnoDs8FBwIrLVRdrT36/8hV1d6yt+F1AhOU x1aBjIh38PNNEyOxdybYlGF8vCCP8ZOetqKshW+/vtFnNDTSsbN7HY+e9vtLpCtNYb tf+iYFsYKQSFBoE4o7eqSNhyNw2WbKId3lz+Do1fZcmTKlyaqjzE6SsETvTb1N9lM8 f1Ev63YjgiiYkZVlyfYbk8OLRQK20sKzmJPX7tmSoHoJqlW+gGBXx32KSDi/RUk8Uf qSCWff+dj28LQ== Date: Thu, 14 Nov 2019 15:38:10 +1100 From: Stephen Rothwell To: Arnd Bergmann Cc: Linux Next Mailing List , Linux Kernel Mailing List Subject: linux-next: build failure after merge of the y2038 tree Message-ID: <20191114153810.55d937af@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/sa_0ylOl5Uo6eotfCQP0FM="; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/sa_0ylOl5Uo6eotfCQP0FM= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, After merging the y2038 tree, today's linux-next build (powerpc ppc64_defconfig) failed like this: arch/powerpc/kernel/time.c: In function 'update_vsyscall': arch/powerpc/kernel/time.c:960:33: error: 'struct timespec64' has no member= named 'sec' 960 | vdso_data->stamp_xtime_sec =3D xt.sec; | ^ arch/powerpc/kernel/time.c:961:34: error: 'struct timespec64' has no member= named 'nsec' 961 | vdso_data->stamp_xtime_nsec =3D xt.nsec; | ^ Caused by commit 009a81339beb ("y2038: vdso: powerpc: avoid timespec references") I have added the following patch for today. From: Stephen Rothwell Date: Thu, 14 Nov 2019 15:28:13 +1100 Subject: [PATCH] fix up for "y2038: vdso: powerpc: avoid timespec reference= s" Signed-off-by: Stephen Rothwell --- arch/powerpc/kernel/time.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index ee9ba3a48c76..2d13cea13954 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c @@ -957,8 +957,8 @@ void update_vsyscall(struct timekeeper *tk) vdso_data->tb_to_xs =3D new_tb_to_xs; vdso_data->wtom_clock_sec =3D tk->wall_to_monotonic.tv_sec; vdso_data->wtom_clock_nsec =3D tk->wall_to_monotonic.tv_nsec; - vdso_data->stamp_xtime_sec =3D xt.sec; - vdso_data->stamp_xtime_nsec =3D xt.nsec; + vdso_data->stamp_xtime_sec =3D xt.tv_sec; + vdso_data->stamp_xtime_nsec =3D xt.tv_nsec; vdso_data->stamp_sec_fraction =3D frac_sec; smp_wmb(); ++(vdso_data->tb_update_count); --=20 2.23.0 --=20 Cheers, Stephen Rothwell --Sig_/sa_0ylOl5Uo6eotfCQP0FM= Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl3M2jIACgkQAVBC80lX 0GzfOAf+PNWcEK0gdZ6HwcziPONofH/oVDlk664B5iRpnNOep3BD14wGWwnJxsIr qEFOb8jEOkaHHpnaBaU6yRKn2BTjAtfMKIKS/qLNjpXikovHny74obUzUvCUao8w +6HeCvtvXzI28Sgg4iP3NgVfqhLzK+PRJqDBsb3hjHAeiB8z00wjKSkUoYvmMaom Y+OzsZv1azQLx9cLm79O5wmAcYYF9O6n+j8tSGGLgfa7Bw3K88MswVdZSHDWdsxx Q29hvZdwVGquzy5gV0gt5t3O/x+As+2o9Fck8tLgfkendlkWPUZZvOE4soUrkCA/ HCE4yia9Trc58tUbaLQiPsN7akum3A== =bjkQ -----END PGP SIGNATURE----- --Sig_/sa_0ylOl5Uo6eotfCQP0FM=--