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.7 required=3.0 tests=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 CBF8AC432C0 for ; Thu, 21 Nov 2019 14:28:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A87C5206CB for ; Thu, 21 Nov 2019 14:28:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726568AbfKUO2Y (ORCPT ); Thu, 21 Nov 2019 09:28:24 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:35207 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726396AbfKUO2X (ORCPT ); Thu, 21 Nov 2019 09:28:23 -0500 Received: from mail-qt1-f175.google.com ([209.85.160.175]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.129]) with ESMTPSA (Nemesis) id 1MhlbM-1hu2qb31Zg-00doDm; Thu, 21 Nov 2019 15:28:21 +0100 Received: by mail-qt1-f175.google.com with SMTP id o11so3828152qtr.11; Thu, 21 Nov 2019 06:28:21 -0800 (PST) X-Gm-Message-State: APjAAAVpE/RjHL+ncTjs8J92/qo5V8Y4lkqGlbPq37p3OVWARlA3KohO XoqskO+3h16FUtM80skNMPwfCV718CVABjY2b8E= X-Google-Smtp-Source: APXvYqxB3fiYXtrETUp5EiMiQ9fb0AeisI+RwKyT7xggRKZinaPFWQOgz7hTMTjBH+1fCN1q48qajjrjZ95bUArYxrA= X-Received: by 2002:ac8:18eb:: with SMTP id o40mr2519477qtk.304.1574346500017; Thu, 21 Nov 2019 06:28:20 -0800 (PST) MIME-Version: 1.0 References: <20191108210236.1296047-1-arnd@arndb.de> <20191108210824.1534248-8-arnd@arndb.de> In-Reply-To: From: Arnd Bergmann Date: Thu, 21 Nov 2019 15:28:03 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [Y2038] [PATCH 08/23] y2038: ipc: remove __kernel_time_t reference from headers To: Ben Hutchings Cc: y2038 Mailman List , Ralf Baechle , Paul Burton , James Hogan , "James E.J. Bottomley" , Helge Deller , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , "David S. Miller" , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "the arch/x86 maintainers" , linux-arch , Parisc List , linux-mips@vger.kernel.org, "linux-kernel@vger.kernel.org" , "H. Peter Anvin" , sparclinux , linuxppc-dev Content-Type: text/plain; charset="UTF-8" X-Provags-ID: V03:K1:LnPyaKtdAcRIfsrfVOvLgTpY2NYcJVXxz9V2TfTsyIVjaxXXWXo J0B/STj89T5mtEIVTc0DQpBVMrYNCU0NcRKyMbhUocUGEvCLRsv+tXSavgQ9f1ideIJ9QR/ Y5hh36oQ5DHX7KGoy+fvIxvqyEiOiRDO5LBnW77E+fjNVlQJvkzhlyATiPB5C1vEiZb5+oS z+IMcyRaYAXzuuyPNj62w== X-UI-Out-Filterresults: notjunk:1;V03:K0:8A/19T5M7NU=:IiGojC9BupST0/of+E3q2T awxsjk77FWMnOwQ4nks8TRVJzj8MaemtAxeTd5LZ6AU026M7mvm1hvPPHZ4QB1SOCc3AYUgwj JPVxeNksokjiewTxADZhlkQvmoHlH8s8IySCW9mTS2t5RD8o/IIkeCztir/MtztaDyYhZGCEF rJutdeF8yCwCOVEmI7Ryya6bzcLeLgOMSoT5Xc8Tr9ih6rF+jVFaOUAXQMQ6sS/CqZm07Z50W 7mFRhVnGeKtcmbTcT0NTLP401mk/Y8oiEAIVOQBfgMLuw2i+hxNpBaSfN4BVM41IYS3h0x3HD uGGmN8Xg4IinXM7DMSUMDAzn6EMtVtq/QLtMgQqKk3tDFwE1zBuRSd44KbYWGHF3Q5aMOUzd8 9Sz0SWtwZrbXJw+mhMw8rLqVMwp4yN0nU2VyHFcMDvtMFQ3BNUPTwIen5wbxdh2wWV5N7roDc doz4p7AZTAPDJskv5JNv1EKjjCl6xvoqQ7wnIp+Al8cIJxYnH6J4UDx5XPfdsrRS4pa+71lbm EWW0/i/p7///JQKDcKCh7ZZ4LPUrE/h1kYwBQP1MHg5hYP9OpFlu0k36Uv+f4AIeXpq+0CrfQ /bVHc+NPvKLBmPdC+v6whkNTSXKYLqce/eejLUwRvJjXDpqKQ00siEcCr21Vy62/XMUgoTMP0 ruAJ3GS2Boof4iy+ow6k+pyZug2crvFBwPmgP5Um5R8Hg5YP1dPhXvfbkPFqPAfvGwOvoplet J2AWy7clG4cWvOnoOy52qSRXi9wlksgco1NEKVg+ITDnHMNlDT01gV4H6HNCGkOncaZ02mV1f WoJKk4TZPuzgJh5AqeiuSTyXXyIiy919eAAca+VxYDVUHKVsaVa633SN22EcLEV1YskVIIOMm T2iRBlyk5NdX4Xcg6V7A== Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org On Wed, Nov 20, 2019 at 11:49 PM Ben Hutchings wrote: > > On Fri, 2019-11-08 at 22:07 +0100, Arnd Bergmann wrote: > [...] > > --- a/arch/x86/include/uapi/asm/sembuf.h > > +++ b/arch/x86/include/uapi/asm/sembuf.h > > @@ -21,9 +21,9 @@ struct semid64_ds { > > unsigned long sem_ctime; /* last change time */ > > unsigned long sem_ctime_high; > > #else > > - __kernel_time_t sem_otime; /* last semop time */ > > + long sem_otime; /* last semop time */ > > __kernel_ulong_t __unused1; > > - __kernel_time_t sem_ctime; /* last change time */ > > + long sem_ctime; /* last change time */ > > __kernel_ulong_t __unused2; > > #endif > > __kernel_ulong_t sem_nsems; /* no. of semaphores in array */ > [...] > > We need to use __kernel_long_t here to do the right thing on x32. Good catch, thanks for the review! I applied the patch below now on top. Arnd commit c7ebd8a1c1825c3197732ea692cf3dde34a644f5 (HEAD) Author: Arnd Bergmann Date: Thu Nov 21 15:25:04 2019 +0100 y2038: ipc: fix x32 ABI breakage The correct type on x32 is 64-bit wide, same as for the other struct members around it, so use __kernel_long_t in place of the original __kernel_time_t here, corresponding to the rest of the structure. Fixes: caf5e32d4ea7 ("y2038: ipc: remove __kernel_time_t reference from headers") Reported-by: Ben Hutchings Signed-off-by: Arnd Bergmann diff --git a/arch/x86/include/uapi/asm/sembuf.h b/arch/x86/include/uapi/asm/sembuf.h index 7c1b156695ba..20cab43c4b15 100644 --- a/arch/x86/include/uapi/asm/sembuf.h +++ b/arch/x86/include/uapi/asm/sembuf.h @@ -21,9 +21,9 @@ struct semid64_ds { unsigned long sem_ctime; /* last change time */ unsigned long sem_ctime_high; #else - long sem_otime; /* last semop time */ + __kernel_long_t sem_otime; /* last semop time */ __kernel_ulong_t __unused1; - long sem_ctime; /* last change time */ + __kenrel_long_t sem_ctime; /* last change time */ __kernel_ulong_t __unused2; #endif __kernel_ulong_t sem_nsems; /* no. of semaphores in array */ From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnd Bergmann Subject: Re: [Y2038] [PATCH 08/23] y2038: ipc: remove __kernel_time_t reference from headers Date: Thu, 21 Nov 2019 15:28:03 +0100 Message-ID: References: <20191108210236.1296047-1-arnd@arndb.de> <20191108210824.1534248-8-arnd@arndb.de> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Return-path: In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org To: Ben Hutchings Cc: y2038 Mailman List , Ralf Baechle , Paul Burton , James Hogan , "James E.J. Bottomley" , Helge Deller , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , "David S. Miller" , Thomas Gleixner , Ingo Molnar , Borislav Petkov , the arch/x86 maintainers , linux-arch , Parisc List , linux-mips@vger.kernel.org, "linux-kernel@vger.kernel.org" , "H. Peter Anvin" List-Id: linux-arch.vger.kernel.org On Wed, Nov 20, 2019 at 11:49 PM Ben Hutchings wrote: > > On Fri, 2019-11-08 at 22:07 +0100, Arnd Bergmann wrote: > [...] > > --- a/arch/x86/include/uapi/asm/sembuf.h > > +++ b/arch/x86/include/uapi/asm/sembuf.h > > @@ -21,9 +21,9 @@ struct semid64_ds { > > unsigned long sem_ctime; /* last change time */ > > unsigned long sem_ctime_high; > > #else > > - __kernel_time_t sem_otime; /* last semop time */ > > + long sem_otime; /* last semop time */ > > __kernel_ulong_t __unused1; > > - __kernel_time_t sem_ctime; /* last change time */ > > + long sem_ctime; /* last change time */ > > __kernel_ulong_t __unused2; > > #endif > > __kernel_ulong_t sem_nsems; /* no. of semaphores in array */ > [...] > > We need to use __kernel_long_t here to do the right thing on x32. Good catch, thanks for the review! I applied the patch below now on top. Arnd commit c7ebd8a1c1825c3197732ea692cf3dde34a644f5 (HEAD) Author: Arnd Bergmann Date: Thu Nov 21 15:25:04 2019 +0100 y2038: ipc: fix x32 ABI breakage The correct type on x32 is 64-bit wide, same as for the other struct members around it, so use __kernel_long_t in place of the original __kernel_time_t here, corresponding to the rest of the structure. Fixes: caf5e32d4ea7 ("y2038: ipc: remove __kernel_time_t reference from headers") Reported-by: Ben Hutchings Signed-off-by: Arnd Bergmann diff --git a/arch/x86/include/uapi/asm/sembuf.h b/arch/x86/include/uapi/asm/sembuf.h index 7c1b156695ba..20cab43c4b15 100644 --- a/arch/x86/include/uapi/asm/sembuf.h +++ b/arch/x86/include/uapi/asm/sembuf.h @@ -21,9 +21,9 @@ struct semid64_ds { unsigned long sem_ctime; /* last change time */ unsigned long sem_ctime_high; #else - long sem_otime; /* last semop time */ + __kernel_long_t sem_otime; /* last semop time */ __kernel_ulong_t __unused1; - long sem_ctime; /* last change time */ + __kenrel_long_t sem_ctime; /* last change time */ __kernel_ulong_t __unused2; #endif __kernel_ulong_t sem_nsems; /* no. of semaphores in array */ From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnd Bergmann Date: Thu, 21 Nov 2019 14:28:03 +0000 Subject: Re: [Y2038] [PATCH 08/23] y2038: ipc: remove __kernel_time_t reference from headers Message-Id: List-Id: References: <20191108210236.1296047-1-arnd@arndb.de> <20191108210824.1534248-8-arnd@arndb.de> In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Ben Hutchings Cc: y2038 Mailman List , Ralf Baechle , Paul Burton , James Hogan , "James E.J. Bottomley" , Helge Deller , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , "David S. Miller" , Thomas Gleixner , Ingo Molnar , Borislav Petkov , the arch/x86 maintainers , linux-arch , Parisc List , linux-mips@vger.kernel.org, "linux-kernel@vger.kernel.org" , "H. Peter Anvin" On Wed, Nov 20, 2019 at 11:49 PM Ben Hutchings wrote: > > On Fri, 2019-11-08 at 22:07 +0100, Arnd Bergmann wrote: > [...] > > --- a/arch/x86/include/uapi/asm/sembuf.h > > +++ b/arch/x86/include/uapi/asm/sembuf.h > > @@ -21,9 +21,9 @@ struct semid64_ds { > > unsigned long sem_ctime; /* last change time */ > > unsigned long sem_ctime_high; > > #else > > - __kernel_time_t sem_otime; /* last semop time */ > > + long sem_otime; /* last semop time */ > > __kernel_ulong_t __unused1; > > - __kernel_time_t sem_ctime; /* last change time */ > > + long sem_ctime; /* last change time */ > > __kernel_ulong_t __unused2; > > #endif > > __kernel_ulong_t sem_nsems; /* no. of semaphores in array */ > [...] > > We need to use __kernel_long_t here to do the right thing on x32. Good catch, thanks for the review! I applied the patch below now on top. Arnd commit c7ebd8a1c1825c3197732ea692cf3dde34a644f5 (HEAD) Author: Arnd Bergmann Date: Thu Nov 21 15:25:04 2019 +0100 y2038: ipc: fix x32 ABI breakage The correct type on x32 is 64-bit wide, same as for the other struct members around it, so use __kernel_long_t in place of the original __kernel_time_t here, corresponding to the rest of the structure. Fixes: caf5e32d4ea7 ("y2038: ipc: remove __kernel_time_t reference from headers") Reported-by: Ben Hutchings Signed-off-by: Arnd Bergmann diff --git a/arch/x86/include/uapi/asm/sembuf.h b/arch/x86/include/uapi/asm/sembuf.h index 7c1b156695ba..20cab43c4b15 100644 --- a/arch/x86/include/uapi/asm/sembuf.h +++ b/arch/x86/include/uapi/asm/sembuf.h @@ -21,9 +21,9 @@ struct semid64_ds { unsigned long sem_ctime; /* last change time */ unsigned long sem_ctime_high; #else - long sem_otime; /* last semop time */ + __kernel_long_t sem_otime; /* last semop time */ __kernel_ulong_t __unused1; - long sem_ctime; /* last change time */ + __kenrel_long_t sem_ctime; /* last change time */ __kernel_ulong_t __unused2; #endif __kernel_ulong_t sem_nsems; /* no. of semaphores in array */ 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.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=unavailable 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 ADCAAC432C0 for ; Thu, 21 Nov 2019 14:33:24 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6805B206CB for ; Thu, 21 Nov 2019 14:33:24 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6805B206CB Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arndb.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 47Jhr23wDYzDr8V for ; Fri, 22 Nov 2019 01:33:22 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=arndb.de (client-ip=212.227.126.187; helo=mout.kundenserver.de; envelope-from=arnd@arndb.de; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=arndb.de Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.187]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 47JhkN5njzzDqtm for ; Fri, 22 Nov 2019 01:28:27 +1100 (AEDT) Received: from mail-qt1-f172.google.com ([209.85.160.172]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.129]) with ESMTPSA (Nemesis) id 1Mr9OA-1i1DrE32BS-00oDWK for ; Thu, 21 Nov 2019 15:28:22 +0100 Received: by mail-qt1-f172.google.com with SMTP id t20so3840441qtn.9 for ; Thu, 21 Nov 2019 06:28:21 -0800 (PST) X-Gm-Message-State: APjAAAUg1XObFYTrGf7iBNZyZ4cJmvGegyqM39AW7i3yQ/TQF8RdBEDS 1gXrbG6pZwVvEXVL0okCXjnS+FUyu5dzqU2mrZY= X-Google-Smtp-Source: APXvYqxB3fiYXtrETUp5EiMiQ9fb0AeisI+RwKyT7xggRKZinaPFWQOgz7hTMTjBH+1fCN1q48qajjrjZ95bUArYxrA= X-Received: by 2002:ac8:18eb:: with SMTP id o40mr2519477qtk.304.1574346500017; Thu, 21 Nov 2019 06:28:20 -0800 (PST) MIME-Version: 1.0 References: <20191108210236.1296047-1-arnd@arndb.de> <20191108210824.1534248-8-arnd@arndb.de> In-Reply-To: From: Arnd Bergmann Date: Thu, 21 Nov 2019 15:28:03 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [Y2038] [PATCH 08/23] y2038: ipc: remove __kernel_time_t reference from headers To: Ben Hutchings Content-Type: text/plain; charset="UTF-8" X-Provags-ID: V03:K1:dpcXnqpNoU75y9IS5Ml3otbZqlrAplpL2hd++/sZqYOK8JVFObn Ty44LRwGxEEpxQVMazQg5re1lO56ON4y6iDkREBsyEVd1UVTj+jZQeHPNkSXByPup8wwqls D9TTnFgB4Wf+23/SSwXqWwBOsaMdguh2NUG9uu//5jzBDumkZZQKMbT7nFrRqMt/+TVtUtc 9LugtelJl+joFzQY+Zy+Q== X-UI-Out-Filterresults: notjunk:1;V03:K0:uzXU+aVXj0Q=:0FZua5Eb/jU00W8OSob1mF ZWb7IjUIksVatZGy24ZrN1W+IqRmHdYby8SnEBV9Sn2mfWYPXi7SMwqYB6TRvj3gDH25gFvBI HvfQLz/A41caFFI4A6VUC2upcXiBS/KLAgl+qV4l3Tbbc9B0aLf9Jnan7H3MUjcZAH2Ql4V1t Ibx13o76GZ6nXGSK0o+6uX8HTVhDb8dSGyGRTYa+Zw6WGplnU/SwhD1wA9C/KbrOg57qgMtkw rXsGt6goutyqQjCqHGKptZVtMrXCE41dASYYboolHJMCnJ1B0jcaRPvoSOcoF8u4yKOWFx3Mr sPVE42lxGyz1ht9P38kBB3W32d81yg/JYbF41zixwxGeYOQTtnamzU3qfRYkFezfBdaESG2DO KbbmlCXvzbmAy+XDN5DfDSfQBAAvyhReq5p3uPSQ8sWll/uddND7fv7weQeAsSRZW7In1kMmd QotL/hV+8tFsMKMp7tsXmY4hKy+DGkzBautajojQBKjDVaNebJ5nqWVgmwDnXVoWWJA6xy1sc iJ5cXTvrG7rS9T+fjNrfaPrt3lsAffxauG7FGHlrdb2rgOnwAq1PUQJpB0gwMG8SUkIEg9Sh7 D/6+VE0iigNrWkbfdGgS8GjkAH75BGlXvGnboiooFBHNsYncShBmyuvVpXD/ZSjr/hrRZ88NU giHdyfgxRw/UwBvvfI6inKUST/whomPqb0hzSZpbywyKcT2/91iDqWht56/INUtpKpP7k/pdo qEAyIZPadHIkY1kA+XOKej0EPC/G+M/u/kJf+sKldsfRwzAxDMtjCL3XP+RG3pFAO3jHc6n/g BHhf1nBb9dgUPH6p0uwdVl5X1VeEyT4Nvk724WXUPuuXDKpO/3ZBEbpnWR+kqITvCsKWEjtvB SIPaAaQdOR/bTHH/8KPw== X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arch , "H. Peter Anvin" , Parisc List , y2038 Mailman List , James Hogan , Helge Deller , the arch/x86 maintainers , linux-mips@vger.kernel.org, Ralf Baechle , "linux-kernel@vger.kernel.org" , "James E.J. Bottomley" , Paul Burton , Ingo Molnar , Paul Mackerras , sparclinux , Borislav Petkov , Thomas Gleixner , linuxppc-dev , "David S. Miller" Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" On Wed, Nov 20, 2019 at 11:49 PM Ben Hutchings wrote: > > On Fri, 2019-11-08 at 22:07 +0100, Arnd Bergmann wrote: > [...] > > --- a/arch/x86/include/uapi/asm/sembuf.h > > +++ b/arch/x86/include/uapi/asm/sembuf.h > > @@ -21,9 +21,9 @@ struct semid64_ds { > > unsigned long sem_ctime; /* last change time */ > > unsigned long sem_ctime_high; > > #else > > - __kernel_time_t sem_otime; /* last semop time */ > > + long sem_otime; /* last semop time */ > > __kernel_ulong_t __unused1; > > - __kernel_time_t sem_ctime; /* last change time */ > > + long sem_ctime; /* last change time */ > > __kernel_ulong_t __unused2; > > #endif > > __kernel_ulong_t sem_nsems; /* no. of semaphores in array */ > [...] > > We need to use __kernel_long_t here to do the right thing on x32. Good catch, thanks for the review! I applied the patch below now on top. Arnd commit c7ebd8a1c1825c3197732ea692cf3dde34a644f5 (HEAD) Author: Arnd Bergmann Date: Thu Nov 21 15:25:04 2019 +0100 y2038: ipc: fix x32 ABI breakage The correct type on x32 is 64-bit wide, same as for the other struct members around it, so use __kernel_long_t in place of the original __kernel_time_t here, corresponding to the rest of the structure. Fixes: caf5e32d4ea7 ("y2038: ipc: remove __kernel_time_t reference from headers") Reported-by: Ben Hutchings Signed-off-by: Arnd Bergmann diff --git a/arch/x86/include/uapi/asm/sembuf.h b/arch/x86/include/uapi/asm/sembuf.h index 7c1b156695ba..20cab43c4b15 100644 --- a/arch/x86/include/uapi/asm/sembuf.h +++ b/arch/x86/include/uapi/asm/sembuf.h @@ -21,9 +21,9 @@ struct semid64_ds { unsigned long sem_ctime; /* last change time */ unsigned long sem_ctime_high; #else - long sem_otime; /* last semop time */ + __kernel_long_t sem_otime; /* last semop time */ __kernel_ulong_t __unused1; - long sem_ctime; /* last change time */ + __kenrel_long_t sem_ctime; /* last change time */ __kernel_ulong_t __unused2; #endif __kernel_ulong_t sem_nsems; /* no. of semaphores in array */