From patchwork Wed Apr 25 13:22:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 134309 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp865175lji; Wed, 25 Apr 2018 06:26:00 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpwPwG423x/lQaxI2nzdxTMRosLi3tj2GPyWRXN7PfUqGFRLkJMJmQ+pgUs+GnTbTxL+o0n X-Received: by 10.167.133.131 with SMTP id w3mr7993200pfn.197.1524662760513; Wed, 25 Apr 2018 06:26:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524662760; cv=none; d=google.com; s=arc-20160816; b=y1AvEHelQE7fdHO3DuQ3QjGYXJIFq80GEja7wH3rtvqirLFiqUjeby4dPRQImFVXQq mWVXMrJ8FdLFAcwTq3ttaPvRoIA/fLIPzmEDfhMpYShAyZQmmdy+cp3IS//NeXpZIkB6 y3NC9PnVRQRw46WOTLwhG5hxf17QvxPI6u1lI+rjWeh7QEBbbb01Uin6nnskC6FneTiw OzUMy34s50FZcgt1Db3jfV8MZr4hmfY3xjLXWRL02emP21MHZi0YON8TgoGtoRVv9pBL 9FA6uPNwnEb6LIvo3vpRg62l3P3HDjEG/aN25++mG62YEC59VPDKYL4Lnl2Ru9M27FY5 Z7wA== 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=WBZYXkYgLsd/0uaN7Mg+onfe1Rdhkrr4yDvlOxdgn00zKYvAHcLh4I0CJF5K0XcA2c G3b6ale7KsvbRX44xbM5+BHJXzlhc/dWVHa6WLaaA8VceBRE21yyd+LUzSGvOMsr7mN5 M8/0dgPSYMyKBV3GBqTINlMMCioxi6U9Lr+IzWIZC3f61ukRN9k9Zq827OfekQ0/XmFm onm6J1JHRFRsFUrIej6EPjEGlnBvjo8AaJwUZF+VtqKfs3TpmaHLpT1uBqfkV/am3OFT BmVGhubz1Aa6ODxnEP4ZPPvshaa0BtBa6DM1W2DUG8rhlaUEhmujIumCrRNIjWHnIukl U8jQ== 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 q1-v6si15689808plr.477.2018.04.25.06.26.00; Wed, 25 Apr 2018 06:26:00 -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 S1754434AbeDYNZ5 (ORCPT + 29 others); Wed, 25 Apr 2018 09:25:57 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:47113 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753040AbeDYNW7 (ORCPT ); Wed, 25 Apr 2018 09:22:59 -0400 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.145]) with ESMTPA (Nemesis) id 0MWjXP-1esU4g3mBf-00XugG; Wed, 25 Apr 2018 15:22:58 +0200 From: Arnd Bergmann To: y2038@lists.linaro.org, linux-kernel@vger.kernel.org Cc: Arnd Bergmann Subject: [PATCH v4 04/16] y2038: ia64: Remove unneeded ipc uapi header files Date: Wed, 25 Apr 2018 15:22:30 +0200 Message-Id: <20180425132242.1500539-5-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180425132242.1500539-1-arnd@arndb.de> References: <20180425132242.1500539-1-arnd@arndb.de> X-Provags-ID: V03:K1:mfVJNYq0oJtcLAxIGLSlzLBS734KezI4y2tjRCdSQ7NvFCUvRnG UV56CXaVktZT1cVQv62kUJ2LdGsYXzAYx9BlaVApKBVAUGePeBIhlLrDGwx9KAuHWPJak7F TS38lpUyPhWaZhwb1iGU8wYk8PilnF+E2/tOVvPCt/QFdJ1hNFQWZHBHITlsae0mj7K0eBC jzw1/rTB7X0gjauCvQsHA== X-UI-Out-Filterresults: notjunk:1; V01:K0:enjv4TuoJZY=:PaCONPSlZz97KmQ6O5LccO vWLgQTr5OohbUL/Zpau/zQUHi+ee4ODgUSUfCRz4ZPIgSUJWqlr/9PNF1qS6A/f4YBLFsKrEx ytAEdICJlc3uu7aBxk7o001XhqNCyUUWMbkAiVIpm1uvGZJ4uTMoyRlTooZb83E5IvfMZJ3p4 gslytLqdZ8IGL+DbK7TYggaCsKYHguGXGhbp2f2A3OG1OXY/D4JZXp0AYUvmdffU0tjkE8716 q6o9/lui2qZa5HRmyu+HZiO06i6sYi+FQYWEhzSNxAIPIoG8gfJHDC0wqROn+BxQuL47QbqJ+ zzK33g64XFO5Nv6YIvSTGET/Xil4CG9k8eX4UepqOj0jZzcAwHoeBFy5qaBEuUZVrTTx2RYA1 6Skqknj2NDDB8kyBdyXTAKlIPE9stwevD6Ev+XY9q4SaSPU158deoA0UFXiLdoQMWnKy0G0gp jk1lbRFvznGlPOP3HPWwPYVZ3cqK6AgdctHm3cDQsb/jzyOKpWOjmx61uRWgJfXEuao25mM6A SdcRmLDdPfM3EocIXwSyh3jKE9F4kZ0sLe+5ZmuTme0EVvEyRBIWUgCmOoUrJX1LI49ucGQOg KIyiMKdMcGkTmiCZTroVOmu1gzD0IUsRaKIBnx0wCBPd6qSkr/B4KgfM5mFDgtr0EFBwNFzbV W0nusEv3P4iVQupSUXOgnWL1vqVc6PPIjnPvJqYowOQU56MFrWcDfeBLWD48x8wJ+D4FYYTlp 7oJTozdMxj1f/LnMaoRPcomu3HnfL+op4CqkiA== 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 */