From patchwork Thu Apr 19 14:37:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 133806 Delivered-To: patch@linaro.org Received: by 10.46.66.142 with SMTP id h14csp714190ljf; Thu, 19 Apr 2018 07:38:44 -0700 (PDT) X-Google-Smtp-Source: AIpwx498p9XB5jRmziiZeZ+IwuzeKFH28Y6t7BYanbjJjasvwlj+9XCLA9HJau8nAcoyzs3Ps02j X-Received: by 10.99.110.198 with SMTP id j189mr5268053pgc.86.1524148723916; Thu, 19 Apr 2018 07:38:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524148723; cv=none; d=google.com; s=arc-20160816; b=z8n4/63n6GY7qB4FGlOepq6j4azo3FiAmhXXBGxyri/bxhWu3NiGxuWKX0cheoSKMC 4D1cHJFWeePGvEPCI0HEIgnLtnP9Qn+tF+YYs8vIBefIs7owwW5A5m6R3jQbdSAB/VTb EF+oZyVUQfmJWHSmPVoR9HR20x39IqY2cy6PMlPq7zhIB9V8g429MkGO6jK/3qJreQWp 4iDubc64vpfxM213augrhMM4cIN35Wkp5t/b+wP56O4TM/72WJYng9HA0hf0kqfQ2mWy zglV0ETHLEx3Iadaw00vwBkQSbK2JdwqT+E4gk4PwMnnXEFewoeq5DMNBKpTvyD1wjRO w1Iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=scVQmMPibmaUCjrnlkAhD+FtGGnY/E4Zdr7onZX+a7k=; b=AvkSxvsGumRJuv9iGM8eWC7nG35tXrk0Ruum3PNxrwzmVFzWbjzJeGWffIcsZIX9aR N3RIVicKTzyR6JQnU7ic99YDGD50Jz5ZXytJGlxhkplFwR13t4s8Oz4mQ+8VSA9r/72D 2R+WJShDrTlD50a9uQfEsnN4UQUlk6EcQNMAfzf8AObwc9K6zEzErEf8C82P4Djoqvcf QjaSy+K2ysinEy8Ckytzd6ARYwvMzSTyBdqKMmm0OxXdKd+EtBSPT5497Ne5Vz2v+0LO 0L6rIZzKyH1Mupo1DywwqV/KGdkjf4tPxiXKvWFZt7pnLTeLIlZ5CHaSKJzM9t2CiNf7 Pu7g== ARC-Authentication-Results: i=1; mx.google.com; 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 p26-v6si3623491pli.35.2018.04.19.07.38.43; Thu, 19 Apr 2018 07:38:43 -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; 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 S1753002AbeDSOil (ORCPT + 29 others); Thu, 19 Apr 2018 10:38:41 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:58611 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752780AbeDSOii (ORCPT ); Thu, 19 Apr 2018 10:38:38 -0400 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.145]) with ESMTPA (Nemesis) id 0LlnHM-1eZpsM14EK-00ZTEP; Thu, 19 Apr 2018 16:37:50 +0200 From: Arnd Bergmann To: y2038@lists.linaro.org, linux-kernel@vger.kernel.org Cc: Arnd Bergmann , linux-api@vger.kernel.org, linux-arch@vger.kernel.org, libc-alpha@sourceware.org, tglx@linutronix.de, deepa.kernel@gmail.com, viro@zeniv.linux.org.uk, ebiederm@xmission.com, albert.aribaud@3adev.fr, linux-s390@vger.kernel.org, schwidefsky@de.ibm.com, x86@kernel.org, catalin.marinas@arm.com, will.deacon@arm.com, linux-mips@linux-mips.org, jhogan@kernel.org, ralf@linux-mips.org, linuxppc-dev@lists.ozlabs.org, sparclinux@vger.kernel.org Subject: [PATCH v3 03/17] y2038: ia64: Remove unneeded ipc uapi header files Date: Thu, 19 Apr 2018 16:37:23 +0200 Message-Id: <20180419143737.606138-4-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180419143737.606138-1-arnd@arndb.de> References: <20180419143737.606138-1-arnd@arndb.de> X-Provags-ID: V03:K1:togmoBqsxPzWYZRjoFWcVxWB8zwSf3VacbiJCfeT+d9Xss8JIqC m3aeZZa0gbY0vMTtvPR4rnllAegCZwvIUHmT9vMCfYDPM1zAYXzdWjQ3cNrgaNt7u8pb9Yn aaCdkCi5bFn9vquqUqWIrakTxl6upoal9CgusA39F6HVsC8PFtv42Pn1+lENE9+zhDg/XJ4 94YNXC7q9hLFtHG0Nz18w== X-UI-Out-Filterresults: notjunk:1; V01:K0:a8+4xEiDwvg=:qIGdbUviRp1TU+YUq9AKT+ tc2Ne6l4NINpyVOjpERT/tgXHdXoOhP3+ywX1Q7LayHPe90nyKIfUKkL2wwgV2W9BOorwfWa6 mh31AWD1s2zD29r6tD9gEJDPawrzuUseV6tWxh9eKs1R+m5nMugscwcX3YWVMMwwPPj++iIo3 3XmjjRpWl6FNKsiaZBmD3D6I5Vh54jC0UgCono+nuSmtXw60A2zP9tCwCt3F7lyK4Q7319vlC jWbFqdLuMzRX5uJctQhrgn2wegDWlAw4Kb/sElqOjk57juFbLsg/6eqN2/aCCRmOGPSROFed8 dyKrWjGFB168w64Pk7J9U74Lcabt9qPZGBhN/Gsr5wcuDjyRgWudhvzBsIGzgJG4KMAHAdzjR a4TCHPJEYEXtMYCZ0RYoeq/x6V5R7YnhcR9Lgm+ENdVFY3xExE8PDa76ALBMRWV+Gn6RyHibb 0psdK9JkPoxuUWeZWrHIObifKxECZD8nTeCzTH+hhgkkE9VloTHYBdBLVRmw10hK4JpuV63bD NwwSJPAyMSVtw7z/EBFWqaEfqLsk6Ls/2NDQ2EXb0YR6EfNZV9G8jHXH5/Wwus4lHHeJKYSx1 rZ6Lby13uB5IeAEasa8GakGgVok7mE/oSAAmmYk1iWeB26xB6XXSLtvcu5M5hhgsejwvSPO/i prwZ7t9GzBtvrsOPZalLGe2DSaEKFeA76AoCh0TfmmHi4PtrjNhnYyQR+7V32bRvaQrBTQUbh Vt7ZfZtu0FhKOVmFzQ+XbRevvfH4he2yVPW7qQ== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The ia64 ipcbuf/msgbuf/sembuf/shmbuf header files are all identical to the version from asm-generic. This patch removes the files and replaces them with 'generic-y' statements as part of the y2038 changes. While ia64 no longer has a compat mode and doesn't need the file any more, it seem nicer to clean this up anyway. Signed-off-by: Arnd Bergmann --- arch/ia64/include/uapi/asm/Kbuild | 4 ++++ arch/ia64/include/uapi/asm/ipcbuf.h | 2 -- arch/ia64/include/uapi/asm/msgbuf.h | 28 -------------------------- arch/ia64/include/uapi/asm/sembuf.h | 23 ---------------------- arch/ia64/include/uapi/asm/shmbuf.h | 39 ------------------------------------- 5 files changed, 4 insertions(+), 92 deletions(-) delete mode 100644 arch/ia64/include/uapi/asm/ipcbuf.h delete mode 100644 arch/ia64/include/uapi/asm/msgbuf.h delete mode 100644 arch/ia64/include/uapi/asm/sembuf.h delete mode 100644 arch/ia64/include/uapi/asm/shmbuf.h -- 2.9.0 diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild index c0527cfc48f0..3982e673e967 100644 --- a/arch/ia64/include/uapi/asm/Kbuild +++ b/arch/ia64/include/uapi/asm/Kbuild @@ -2,5 +2,9 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += bpf_perf_event.h +generic-y += ipcbuf.h generic-y += kvm_para.h +generic-y += msgbuf.h generic-y += poll.h +generic-y += sembuf.h +generic-y += shmbuf.h diff --git a/arch/ia64/include/uapi/asm/ipcbuf.h b/arch/ia64/include/uapi/asm/ipcbuf.h deleted file mode 100644 index 90d6445a14df..000000000000 --- a/arch/ia64/include/uapi/asm/ipcbuf.h +++ /dev/null @@ -1,2 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -#include diff --git a/arch/ia64/include/uapi/asm/msgbuf.h b/arch/ia64/include/uapi/asm/msgbuf.h deleted file mode 100644 index aa25df92d9dc..000000000000 --- a/arch/ia64/include/uapi/asm/msgbuf.h +++ /dev/null @@ -1,28 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -#ifndef _ASM_IA64_MSGBUF_H -#define _ASM_IA64_MSGBUF_H - -/* - * The msqid64_ds structure for IA-64 architecture. - * Note extra padding because this structure is passed back and forth - * between kernel and user space. - * - * Pad space is left for: - * - 2 miscellaneous 64-bit values - */ - -struct msqid64_ds { - struct ipc64_perm msg_perm; - __kernel_time_t msg_stime; /* last msgsnd time */ - __kernel_time_t msg_rtime; /* last msgrcv time */ - __kernel_time_t msg_ctime; /* last change time */ - unsigned long msg_cbytes; /* current number of bytes on queue */ - unsigned long msg_qnum; /* number of messages in queue */ - unsigned long msg_qbytes; /* max number of bytes on queue */ - __kernel_pid_t msg_lspid; /* pid of last msgsnd */ - __kernel_pid_t msg_lrpid; /* last receive pid */ - unsigned long __unused1; - unsigned long __unused2; -}; - -#endif /* _ASM_IA64_MSGBUF_H */ diff --git a/arch/ia64/include/uapi/asm/sembuf.h b/arch/ia64/include/uapi/asm/sembuf.h deleted file mode 100644 index 6ed058760afc..000000000000 --- a/arch/ia64/include/uapi/asm/sembuf.h +++ /dev/null @@ -1,23 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -#ifndef _ASM_IA64_SEMBUF_H -#define _ASM_IA64_SEMBUF_H - -/* - * The semid64_ds structure for IA-64 architecture. - * Note extra padding because this structure is passed back and forth - * between kernel and user space. - * - * Pad space is left for: - * - 2 miscellaneous 64-bit values - */ - -struct semid64_ds { - struct ipc64_perm sem_perm; /* permissions .. see ipc.h */ - __kernel_time_t sem_otime; /* last semop time */ - __kernel_time_t sem_ctime; /* last change time */ - unsigned long sem_nsems; /* no. of semaphores in array */ - unsigned long __unused1; - unsigned long __unused2; -}; - -#endif /* _ASM_IA64_SEMBUF_H */ diff --git a/arch/ia64/include/uapi/asm/shmbuf.h b/arch/ia64/include/uapi/asm/shmbuf.h deleted file mode 100644 index 6ef57cb70dee..000000000000 --- a/arch/ia64/include/uapi/asm/shmbuf.h +++ /dev/null @@ -1,39 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -#ifndef _ASM_IA64_SHMBUF_H -#define _ASM_IA64_SHMBUF_H - -/* - * The shmid64_ds structure for IA-64 architecture. - * Note extra padding because this structure is passed back and forth - * between kernel and user space. - * - * Pad space is left for: - * - 2 miscellaneous 64-bit values - */ - -struct shmid64_ds { - struct ipc64_perm shm_perm; /* operation perms */ - size_t shm_segsz; /* size of segment (bytes) */ - __kernel_time_t shm_atime; /* last attach time */ - __kernel_time_t shm_dtime; /* last detach time */ - __kernel_time_t shm_ctime; /* last change time */ - __kernel_pid_t shm_cpid; /* pid of creator */ - __kernel_pid_t shm_lpid; /* pid of last operator */ - unsigned long shm_nattch; /* no. of current attaches */ - unsigned long __unused1; - unsigned long __unused2; -}; - -struct shminfo64 { - unsigned long shmmax; - unsigned long shmmin; - unsigned long shmmni; - unsigned long shmseg; - unsigned long shmall; - unsigned long __unused1; - unsigned long __unused2; - unsigned long __unused3; - unsigned long __unused4; -}; - -#endif /* _ASM_IA64_SHMBUF_H */