From patchwork Thu Apr 12 14:20:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 133296 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp1739369ljb; Thu, 12 Apr 2018 07:23:35 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+qGShTtvNCmn5HMzyL6/gNZ1uvBIwC0CIvu/DxGm4jKNq7SHzrWVL/OKLvu/yjhyt49YC/ X-Received: by 2002:a17:902:714e:: with SMTP id u14-v6mr1280325plm.356.1523543015649; Thu, 12 Apr 2018 07:23:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523543015; cv=none; d=google.com; s=arc-20160816; b=yrXuk24uuex6ZElg1NMEJl+578zpljaSx/BeQ5e7Vu4qd+Irwk3kwR4uvl5+f8bLO3 hqyoHlKXjlygQ8NQ/4r+o4SAf3fhGXnGe+piM6rb6PiI7e5KhFTgMB3JQfYfvduW+elS JNhVGFwFadMDF/x/3zlOF+amjosgFO1cqnKB10n4L52f4dhcmwGql2hudYj9o3uZBBAD f+3ho3ixeHMigx7KoyUXTZjwM5QQOLQaLIPaKiOItpNBBn+QdPEIhuhQ+BcLIMpRHouA ZG1rbuZtFF3FMCiukBqx1sb8Mv4qU4fB5rgilGxViRe1GS3+vXrOT5D+3U9EL2V/5Rxl VODQ== 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=TwBOc3TC7keLqBPOba5VtB/f+tY4+NKzqFp5iZnvCrw=; b=biIW+pF3BRSYKY6C8qTFEf1wZMmjFPZj/ldWBlQpkqANo1LxxK6qcquKv8BcPpsFNL nzl0jMP1cFW2nhjYnJWMRvgd3YEAXsYelZ9PfEKDGcb0+OS6W5IVbAlaVDGfKfUs2xSQ /TsfvkgZn1TpuY9R1BfspR/j+f/lO9jfYi69AOPv2wba5BIwHEU5Br9a2z2OmeZgESK1 6GHDX9rV64i+Im1UBFzluudqTOhEezyVE4cP8+Gsa6B2mpcB93+NUnQ1v8skANWZeOJy MWqPL07yB4A5K5ALreRiNtH7TPpsKih/wSKy2VBjgcfEGcQat3XIAUEwPtdo+7/DN2OI CohQ== 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 t6-v6si3563834plz.27.2018.04.12.07.23.35; Thu, 12 Apr 2018 07:23:35 -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 S1753580AbeDLOXb (ORCPT + 29 others); Thu, 12 Apr 2018 10:23:31 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:60501 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752833AbeDLOUe (ORCPT ); Thu, 12 Apr 2018 10:20:34 -0400 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.145]) with ESMTPA (Nemesis) id 0Lxwsm-1eRzLp0DNk-015FTi; Thu, 12 Apr 2018 16:20:33 +0200 From: Arnd Bergmann To: y2038@lists.linaro.org, linux-kernel@vger.kernel.org Cc: Arnd Bergmann Subject: [PATCH v2 03/13] y2038: ia64: remove unneeded ipc uapi header files Date: Thu, 12 Apr 2018 16:20:14 +0200 Message-Id: <20180412142024.853892-4-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20180412142024.853892-1-arnd@arndb.de> References: <20180412142024.853892-1-arnd@arndb.de> X-Provags-ID: V03:K1:zVwpS9/J2Hf6VrlPksFCMZxh4FLBhouqZXPzZVLVSp3rYasj6Bz pWBfdghZE+vhf3EoJ6iaFXMEU5TuyJg4xixZ+Vej0rLvtGHDUoWDOPa9GKb1euViIgDtbXr DExbbYhFNITF+PV0vPbqTOdpkkyOZFs5+ZLz/x8eVz2xgKu9XHsNpURGW5GxMlY/x0h2Dc7 q5BTcCxvmqvmy3sfr+qTA== X-UI-Out-Filterresults: notjunk:1; V01:K0:JoUskXIVKXo=:nUWV291sea+bnVig0Pz8el nhr7vYsQtjrzrss/M1O4Goa7IrQxZYeAYHxndbYG+0+RzjsMqj9WSRgnoBxVvtmXroUH14wvf L9NIuQBm4qEk+t6e4c+0ZWi2bdFwuF50Rx6HpLVg2Qy/RTZUiE6Ipdn9KjlmYzbZEu7bV192S 8B1iWOk11R5KvolPtI3t5T1x39QL3YhIQfk/UQcVsMinxLTja/Ija/IgrM4x7G/5Jcjx3tjw2 AKbZ9xDj2g7rzWma2dUwvxk/mryNDFaGEybH7Lis7K4TGLDbkAGh3KYKTUbDUu+tSWls3lAHo VpEbvmh/TlYwkM8AjGT0/N03PQwjPRoeBgnSA9i+anJEqG1r951gXvKwJMQfbsHtUVmWDhVdY R7jwNS3BcXttJmaumKIs/V2Ej2O/YB2pT61pd1/pD/Vn/IiDuGmv02MHhBEurAtEQeLhgwbz/ neCBzK4+w0hC5I7z3xeoJnG1s0HauFLXFq4s1qBuK6TF1qb8VSTGmrPAt4IlyRNnzdlV3sq8w t6VffmwXs38kZHgF3hon5ZITH4basZOtxD+jtAxDnHJfcD9bT/N82tS5NlKlg2Q6QgwyexPpA Rjj2cb6gG12RxOow+RNp1GNB9noevu8eKpVSWepj0u9VKt4eauvgzfu4uN+M/WLP5P8qRqtOZ QHpj/4YCg9qKxg4KZJOmbRDuobzIjtQfrbjP+jX6BAsg5r/HCWvZDafkuRdgkhf0cOi+rZZxl KpTDCodLfamlpEGr4w0k63P2+NyHCIuejuEr6A== 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/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/asm/Kbuild b/arch/ia64/include/asm/Kbuild index 557bbc8ba9f5..c6d448e832f9 100644 --- a/arch/ia64/include/asm/Kbuild +++ b/arch/ia64/include/asm/Kbuild @@ -1,9 +1,13 @@ generic-y += compat.h generic-y += exec.h +generic-y += ipcbuf.h generic-y += irq_work.h generic-y += mcs_spinlock.h generic-y += mm-arch-hooks.h +generic-y += msgbuf.h generic-y += preempt.h +generic-y += sembuf.h +generic-y += shmbuf.h generic-y += trace_clock.h generic-y += vtime.h generic-y += word-at-a-time.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 */