From patchwork Wed Apr 25 15:01:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 134325 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp977109lji; Wed, 25 Apr 2018 08:03:04 -0700 (PDT) X-Google-Smtp-Source: AIpwx48N2DKTjsgQeZGRVV+JAwa4kgWzNblW4iOkNIuk3yUp5FIQyvFLMPHxF8k3F2titZFbf/SF X-Received: by 10.99.123.15 with SMTP id w15mr23292863pgc.405.1524668584232; Wed, 25 Apr 2018 08:03:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524668584; cv=none; d=google.com; s=arc-20160816; b=mh1xaA7gp4R1Lwli34/vCYKvrY4MZGXlt9JpnDs42bN+JfmdrY4OVhNsjJF1BKAJXQ c8Sn5WZbBHp2yY52Ffo0l8S4FJ71UhVVZZAc4T/SRsljSwNJkEe8XurhZ8Za2iYQeUkr pQrlesepH0QyyXxfhALwn3iuIAphMT8gRLlIgxTGRNT1ZOyknYA9VJkIELH+0Ziw3bGU ETumsrss1icULpFgdHosWqhIvgb3jpJkhq7MTYhmWbkOPSYhsLE3G7YVpLYwE8k3KKJQ CgHy4H7jqipUGNGUwcXMun0wL3IiheLsOoNp7+B6teq5RzRUvipM/oCnNdkX/L5J/CLt O8Ew== 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=XtM7rZEhfNXfxy5aDuJ0byj9FqIRVtPU5RADUe6Z8Qs=; b=BLWDnMNMNoj5k6kEBspmrfb0H6TE2EcYv391zfLtY4xhSI7i7ZPXZZkN4FUzPYe34Y oFkfnFE6Feib25uU4H49pmvvPANAsGV+C4V8cJPv29sAUj4Kn3X7ZbOLHMLDFwwXyp0E ohwjLzV8S1L9PBBlbwfQw+5oSZQ+rqMo64p7t1cCfwEzS4Jiz34NeYn0aR+aiGuinSjz PnUXbiyIDydCSRosBSE7FykjNEDFSKfXfVyqN5Do/C328niE6JSfuY08WR3m1q36VO2k ztu1WWuaBxVuouW1Tl67GoGK6DfwB8V5bMuJc+9kF1FVdeS25vvYbMvEJcg3QpluDzHr P+zw== 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 l15si11507103pgn.414.2018.04.25.08.02.52; Wed, 25 Apr 2018 08:03:04 -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 S1754912AbeDYPCh (ORCPT + 29 others); Wed, 25 Apr 2018 11:02:37 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:54873 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753632AbeDYPCV (ORCPT ); Wed, 25 Apr 2018 11:02:21 -0400 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.145]) with ESMTPA (Nemesis) id 0LdmwF-1eU55b1M5T-00izk5; Wed, 25 Apr 2018 17:02:20 +0200 From: Arnd Bergmann To: y2038@lists.linaro.org, linux-kernel@vger.kernel.org Cc: Arnd Bergmann Subject: [PATCH v4 03/16] y2038: alpha: Remove unneeded ipc uapi header files Date: Wed, 25 Apr 2018 17:01:54 +0200 Message-Id: <20180425150207.822862-3-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:9HGe3OwBGBfPbPNvjAsRTuqj1i9ozt00DoMjJGkP4IL+wkiXTPJ HG2klRkuRd7m4jvlz0sTr0TDxKY8wMecrQU1M2XZ8XZUujw5TuQLwfN2hQ0petp/mDMOgbl aiA23e2Z5QgSTC2g7ZE2xeb2trPe/PsNDuK3mcMWDsVnw//lDvrho0sN8mZ/MM6q4m8uL59 jzSBlZxef7WZHpXyjYd5w== X-UI-Out-Filterresults: notjunk:1; V01:K0:hrgxEiKT1ik=:/RtR8DOY8OdCX1Tt//vt7q fGzOlgwi4jeYS6PF4TIOLmoDDFUW62iDypXTXvEjAOFjxUNHaznF7hY7+/ct+3tU5oy3ajcqD tAJFQ9c42Q7RBNzVqSDuT2dE/5Zi5PdsOMGH90RPjkSeaE1RYmRFOvChe4ZYsrJHmDuCln+p6 DAsM9iHK9wXtK9HNKiFAG1PfiTbpEl1k1r12GitFvAKIWrRi4RmMXt3EOmVKG7OZgKwub1Veu NCHMUuwXonGhSmv5zbQZ9HqjGNCiyU84MOkiikcNaFy6RpXf+m1ECfnrbUH2YT2zMBGeWDui3 yeaO1KnDdJaqOIixDnat2mxF9VeMsy6S/gQsZjde6MTIyr1wWr2AOhAinwOVaEPuAvsRrB0C1 M0uFkXWkJ1TcGOgnKojorTYk+k0FornpOgAFlH7t48TprslR0SrVNBCd3bGrHg7Oa4l1IS1Vm dAaK2DkfV1Sfs1H1u9H7Ap1Ccmyk+cQQ+mNBT0IzgANx501zC12z8pQAQpzb5GNiS3yu1bjDy zepATs8ZEwOknzpmHf4zg+U4aIsmlTgiD4LYNbRzDeQOSr+hFPVPPXFgaQlmGxpENJ7yfxKFe XKmQDAVr71LGvi8lS1iDGxFy1zc63efdd1oe9Fk0XBLoS4bj2tBJKGQIzN5vC2DZRJOC+uO2I L3st044gMHH37BPyhi2ZxDAgHmZg2VmFeanmkwE7mydcNDlAHPXZVBvriHwNlT+O6DPxWPGlL Kp0IKNO4lnzB+cMzF4t1lXLFxXJl6JlghSuagQ== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The alpha 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 series. Since there is no 32-bit syscall support for alpha, we don't need the other changes, but it's good to have clean this up anyway. Signed-off-by: Arnd Bergmann --- arch/alpha/include/uapi/asm/Kbuild | 4 ++++ arch/alpha/include/uapi/asm/ipcbuf.h | 2 -- arch/alpha/include/uapi/asm/msgbuf.h | 28 -------------------------- arch/alpha/include/uapi/asm/sembuf.h | 23 --------------------- arch/alpha/include/uapi/asm/shmbuf.h | 39 ------------------------------------ 5 files changed, 4 insertions(+), 92 deletions(-) delete mode 100644 arch/alpha/include/uapi/asm/ipcbuf.h delete mode 100644 arch/alpha/include/uapi/asm/msgbuf.h delete mode 100644 arch/alpha/include/uapi/asm/sembuf.h delete mode 100644 arch/alpha/include/uapi/asm/shmbuf.h -- 2.9.0 diff --git a/arch/alpha/include/uapi/asm/Kbuild b/arch/alpha/include/uapi/asm/Kbuild index 9afaba5e5503..1a5b75310cf4 100644 --- a/arch/alpha/include/uapi/asm/Kbuild +++ b/arch/alpha/include/uapi/asm/Kbuild @@ -2,4 +2,8 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += bpf_perf_event.h +generic-y += ipcbuf.h +generic-y += msgbuf.h generic-y += poll.h +generic-y += sembuf.h +generic-y += shmbuf.h diff --git a/arch/alpha/include/uapi/asm/ipcbuf.h b/arch/alpha/include/uapi/asm/ipcbuf.h deleted file mode 100644 index 90d6445a14df..000000000000 --- a/arch/alpha/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/alpha/include/uapi/asm/msgbuf.h b/arch/alpha/include/uapi/asm/msgbuf.h deleted file mode 100644 index 8c5d4d8c1b16..000000000000 --- a/arch/alpha/include/uapi/asm/msgbuf.h +++ /dev/null @@ -1,28 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -#ifndef _ALPHA_MSGBUF_H -#define _ALPHA_MSGBUF_H - -/* - * The msqid64_ds structure for alpha 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 /* _ALPHA_MSGBUF_H */ diff --git a/arch/alpha/include/uapi/asm/sembuf.h b/arch/alpha/include/uapi/asm/sembuf.h deleted file mode 100644 index f28ffa668b2f..000000000000 --- a/arch/alpha/include/uapi/asm/sembuf.h +++ /dev/null @@ -1,23 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -#ifndef _ALPHA_SEMBUF_H -#define _ALPHA_SEMBUF_H - -/* - * The semid64_ds structure for alpha 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 /* _ALPHA_SEMBUF_H */ diff --git a/arch/alpha/include/uapi/asm/shmbuf.h b/arch/alpha/include/uapi/asm/shmbuf.h deleted file mode 100644 index 7e041ca2eb40..000000000000 --- a/arch/alpha/include/uapi/asm/shmbuf.h +++ /dev/null @@ -1,39 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -#ifndef _ALPHA_SHMBUF_H -#define _ALPHA_SHMBUF_H - -/* - * The shmid64_ds structure for alpha 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 /* _ALPHA_SHMBUF_H */