From patchwork Wed Apr 25 13:22:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 134313 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp865306lji; Wed, 25 Apr 2018 06:26:07 -0700 (PDT) X-Google-Smtp-Source: AIpwx49EDBSUeZlk1boLIMUYfoXfnCFQHaMkhaTZA4ELaCyc6sN3lDfHZIdVd/KqsIvB+UtHxqjC X-Received: by 10.99.177.5 with SMTP id r5mr23015882pgf.186.1524662767213; Wed, 25 Apr 2018 06:26:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524662767; cv=none; d=google.com; s=arc-20160816; b=bWf0ZTzAUMEkZx8wM8TfyBIAIPeEfezczvwp9a6pHkCvOpmq8Ti33X29ZUR35GR3nZ HlV0jajBvaMYMOOKRNhqXDfeZxOm2FsWdIJOawagjK6cIB0bOWigF3L8OGsNwOQQ3EF3 lq5QJ0zg5NACQfg8PJo1KsLtvvTGI5fcCkalW3IZySVn5EUFA1DALWF//HCxRRVB6Kd0 D12Mf5LM5X2Cra3HXaHtORPFt6dxICQWSwkVP3Ojpb3/qD+S412fw7xuCddPCmC0heAv UtiD4QoGfqnATEjk+MgMQxwjq2VqgqrDLFA7zpfUnAycqSSWubZH5KKCpgCH3H70DyEm bTcQ== 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=AjfqZxwnJuWGXkBTtqlxJIcQl4vR0TpZfwPE/Q+KylsZy2vDYrw9VqNZr7WyNb2Jqq XqAkv7k+VpsOz5vcuhYxM64fVkWt/72bv9Xf5no9O0MpUGKoUOUkyQcXroF8iVR2+T+t CmmO6UbjJ0LnGxlTY8hMzvDO/XUP5SuMBgvKhUOf8QIda5EYh89w2nX6CsoEYFeKegxk wCxxH2CAcUbT9GcKm0aXZb+CwvmnWoaK91SpP/0XVTM0iSN6yNlMeRhl+iXHrV03pCJ4 9fA8pPd0tyJJy2KkSsIHP2We9pNBdWS6Pn5siswUb06fF/s4nI5V2tzdsJ1lH8T0Rkh9 wzbA== 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 l22si11500064pgn.74.2018.04.25.06.26.06; Wed, 25 Apr 2018 06:26:07 -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 S1754594AbeDYN0D (ORCPT + 29 others); Wed, 25 Apr 2018 09:26:03 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:39133 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752985AbeDYNW7 (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 0Le53E-1eaxQL2uC4-00pqyJ; Wed, 25 Apr 2018 15:22:57 +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 15:22:29 +0200 Message-Id: <20180425132242.1500539-4-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:nNxmCVph91iMEuhvNV8ggAHicLgiXCPVDs/Lox21+qZXVcnvyQC xfAOqtKdsr3zO5dt15bcLUHKJMgsBVHTXFoW6F7Kc8zYMFEpx/El5lk3RfVM21s7E3Etms4 v6JrfKuKWXZWyDmmSKIkWdAJZlHV/NdYWhZIDMRWtFrMIim9+CoZM9Z8uY+REkx/qgupHCf NOK7wj6p/yCk/pSMisLLw== X-UI-Out-Filterresults: notjunk:1; V01:K0:XoRTgtyhi5M=:41IBRo/KyEVKOBaBbCo1Rn TaS+23yR7djdU0FIhhuBC0cefx8Zjx5CrCNz30iH/MhwbLHOlVgZr0tygQXLp0Pq8VZLHlf1N SICBeE6NeHm5S/WshP11/y8sh4+ECg5qZ1wpHGTJaTGEyu7uPnl1m9gnWNS907SvCEuOsEuv0 j2uGn13+UsYmJVjQ2t10Id/cXII9npNNHuucwerKWMB91c9cWffibDhr4doU6fy5++Bm+aeMT lZBHwAWMgE842rhVKFh8ah9ksWod6f7J7dv4ALCZwx6ZhZxXrfWjiAJ5GRYUKuj5B1mCQGCb0 rpJ+P8YOTcpB1adB/OQ+M9umFatY2XBnp52B282bHlEmjC2Np8zsjT4jo6AjtH+klwFoUep00 Vaody6kXRcbO58gBg5jWTn477D/i9DxNMHIR5twt+kjuqUKXiD6610H16zNujvzTeMD08qo6J R+npynexCo+1mAJB0yBv2Wtsk47jtIx/Yztqee0fb/wbyP4NIZj70PY6d32etekEtSn9pMFrz yHUoz14WmH9MuNRGIPnaQ6E9J5j9+WdeStYEy4/uC3A/YgLwoWrEuibgmBD1WbWn6Mo7sUSNF h2+ymEe9mUAn07T8QKmjLE6qi0Iv43KKU8XfjLL9mIgJs25hnfcjMDdjJfjo+0c9DYRzhDaU4 DjYtJBvFvppkHKfjc8DhaCOpE0FxABMKJPONNQ9MLNkXwFtVs/TGljrB/EF3XywjyFMZfmx9q G7SH+GueR724+lZzsliTm4AhoNq0LHCWeeASYw== 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 */