From patchwork Wed Aug 29 12:59:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 145424 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp653052ljw; Wed, 29 Aug 2018 06:04:59 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYgso/g34yiOrecpG/AUhel6OY2Kft16BFkqiOM7TofiOX5haJEjA4sxOxKqY1qeYprPV5p X-Received: by 2002:a65:450a:: with SMTP id n10-v6mr3726311pgq.392.1535547899615; Wed, 29 Aug 2018 06:04:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535547899; cv=none; d=google.com; s=arc-20160816; b=eXOr+HKljQX9xk0kugV8/H0s4FqJy3xNC/9qHFsLHDSDLrth3X7K0M4RfYdSC0Iq3L pvR1W/ZMPl3EXpfL12ZdzQtXfY6PtiF4yyFYp5SvNCczOnlaY33KCIeOBnQ8L0eZQFTG qwry8hYH40XYwF4djHZ/8vG/gfmPMn83Ir0yuMziv8nJEoFpBkAsIwcYePkgDBSyCSct /sPM1YW89C4YPpe9zTkqf9nnsQHHHPTGbXBb4vQqnbQO9jXYrs61nhA7geXKaVpS4eDg Rn8eSz+Ud1M8/Z7WT2JPRr15iWN1VI9Sv5JKcHlofJv+jCIRS6jdOGdO1nYG4Livu8JB 5E9Q== 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=yB5cF6EzIpTXZFGuZd9Snno9Cl1lNxfHihg1x1bYG6w=; b=IyNYJ8gFcCM+Zv7PHAgXIyFa3NloaiBo6kSnPwY8EgGAjbxnVAXQraMkbfRGgs/fig 9arfZC4lgwUMGFrq8gQRMRvm8k8b03aNICc0+SSrrJxozrK3lOUCL1PFOibftN0FTTSH E8vVcN3O4Xcz9jusy7yTNdrHgbsUcxU//Fe8Lc91krojsgLooQu3NONbQgaFjgz4tZvS PVPth0jMQKSjWLpiMKvg96slSAyUJQQb63Wrkuxcsmc6WwCHV8onr6XodmlzLn4b/1Jk e1IbWVBu03hR06JqYuugoSKd6dnBhtRRG4I0e4MT22ch1Dc5Ybc+mOKKgGqaty/j9BFU OgzA== 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 h1-v6si3751686pld.152.2018.08.29.06.04.59; Wed, 29 Aug 2018 06:04:59 -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 S1728594AbeH2RBs (ORCPT + 32 others); Wed, 29 Aug 2018 13:01:48 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:40593 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726848AbeH2RBr (ORCPT ); Wed, 29 Aug 2018 13:01:47 -0400 Received: from wuerfel.lan ([109.193.40.16]) by mrelayeu.kundenserver.de (mreue103 [212.227.15.145]) with ESMTPA (Nemesis) id 0MNvNj-1g1IkR1e27-007WRz; Wed, 29 Aug 2018 15:04:36 +0200 From: Arnd Bergmann To: netdev@vger.kernel.org, "David S . Miller" Cc: linux-arch@vger.kernel.org, y2038@lists.linaro.org, Arnd Bergmann , Tony Luck , Fenghua Yu , "James E.J. Bottomley" , Helge Deller , Thomas Gleixner , x86@kernel.org, Al Viro , linux-ia64@vger.kernel.org, linux-kernel@vger.kernel.org, linux-parisc@vger.kernel.org, sparclinux@vger.kernel.org Subject: [PATCH net-next 2/3] asm-generic: generalize asm/sockios.h Date: Wed, 29 Aug 2018 14:59:11 +0200 Message-Id: <20180829130308.3504560-2-arnd@arndb.de> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180829130308.3504560-1-arnd@arndb.de> References: <20180829130308.3504560-1-arnd@arndb.de> X-Provags-ID: V03:K1:hYNj9qlYrG7wffQwQ11kkhNczSOtyzhmsG0cQmDZVsMZFwTtPPp u5THBJlqZDetbco7RCXHgfwWBJuivvSe+sgD/W+VMzvp/qXTLsvMutcBYb++5WpF1IlMXIh 10myQQS18INRmj4/BSUg4YjF2VDSTZHaax3OksgK4G92iatoeAW0d+ZfkfBnuaKd+s3hRYT LCIK4N1MD2C2xGOGMpFOg== X-UI-Out-Filterresults: notjunk:1; V01:K0:9z4T3+qheSo=:qZb1MXHiPuJ6QTL4OktLsi V2psAz6hUqoF896lfsPJ+mDP35GpZwqqpAWaOEULGd90p6ppFNGkvSjbXfVtoE2sH2pvPiwfh FBgCWAWQcX+7Y+ZCVTaoxrdsAMigj3pXY3lBhxr7bV7NpB45HlspuGrOE1IAE5fFHcSX6My2c 0jztUenc+ugWsm9Ga54qgzec7msYKDwPX6x4xt/2DoIbkMO5aAPCBhb6J1RowF+EnizVkNHlu 4BYLwVFWUFy8fQ4phNDFxLXxPiArEv5KXnEMO24l1RU16aYiTqhwWe+r/T9sIQTVPUidlTokB XVS1ZciWk6h4OVGJY0hjhKrCWanuoPjAjEYya3ll9WETMmY/xR1v81TdBprqR3IXGSWH9etIJ HABj8ZPb8v0er+pjWEsdIU4heDnR7J5DQVpNBtlYjnSTaIbT1mtCcbHEfm3LKe9QT6gU2FNTP RgV89dSz9larFIzeK5lNQPztMUv6+YCMK0mNruXWY7O7uMK1ZGAr/R3o6MNpZHEz0gRcfEdYt UY4e4rS6BcwUNyV6kF6x/p72R84lDDH0ImP589+PskrottzATG2aMbFPiOqOAoQqbVWd+RzVP KcJxeyP+F5JNpSnFTe+Mahph/Y/eQ/V7bXOcCawJHzJrDY6/YtbqYM3TZSALIjv9r8TRKFn6S PS70tnNnM1+aOlOtoqtIAKWJtgjnx67+YLzhuGKOKb4gbSBjLveoW7vuXT4I7gvjXAT0= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ia64, parisc and sparc just use a copy of the generic version of asm/sockios.h, and x86 is a redirect to the same file, so we can just let the header file be generated. Signed-off-by: Arnd Bergmann --- arch/ia64/include/uapi/asm/Kbuild | 1 + arch/ia64/include/uapi/asm/sockios.h | 21 --------------------- arch/parisc/include/uapi/asm/Kbuild | 1 + arch/parisc/include/uapi/asm/sockios.h | 14 -------------- arch/sparc/include/uapi/asm/Kbuild | 1 + arch/sparc/include/uapi/asm/sockios.h | 15 --------------- arch/x86/include/uapi/asm/Kbuild | 1 + arch/x86/include/uapi/asm/sockios.h | 1 - 8 files changed, 4 insertions(+), 51 deletions(-) delete mode 100644 arch/ia64/include/uapi/asm/sockios.h delete mode 100644 arch/parisc/include/uapi/asm/sockios.h delete mode 100644 arch/sparc/include/uapi/asm/sockios.h delete mode 100644 arch/x86/include/uapi/asm/sockios.h -- 2.18.0 diff --git a/arch/ia64/include/uapi/asm/Kbuild b/arch/ia64/include/uapi/asm/Kbuild index 3982e673e967..a6377ad3ba1c 100644 --- a/arch/ia64/include/uapi/asm/Kbuild +++ b/arch/ia64/include/uapi/asm/Kbuild @@ -8,3 +8,4 @@ generic-y += msgbuf.h generic-y += poll.h generic-y += sembuf.h generic-y += shmbuf.h +generic-y += sockios.h diff --git a/arch/ia64/include/uapi/asm/sockios.h b/arch/ia64/include/uapi/asm/sockios.h deleted file mode 100644 index f27a12f95d20..000000000000 --- a/arch/ia64/include/uapi/asm/sockios.h +++ /dev/null @@ -1,21 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -#ifndef _ASM_IA64_SOCKIOS_H -#define _ASM_IA64_SOCKIOS_H - -/* - * Socket-level I/O control calls. - * - * Based on . - * - * Modified 1998, 1999 - * David Mosberger-Tang , Hewlett-Packard Co - */ -#define FIOSETOWN 0x8901 -#define SIOCSPGRP 0x8902 -#define FIOGETOWN 0x8903 -#define SIOCGPGRP 0x8904 -#define SIOCATMARK 0x8905 -#define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */ -#define SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */ - -#endif /* _ASM_IA64_SOCKIOS_H */ diff --git a/arch/parisc/include/uapi/asm/Kbuild b/arch/parisc/include/uapi/asm/Kbuild index 286ef5a5904b..be6c171f57f7 100644 --- a/arch/parisc/include/uapi/asm/Kbuild +++ b/arch/parisc/include/uapi/asm/Kbuild @@ -7,3 +7,4 @@ generic-y += kvm_para.h generic-y += param.h generic-y += poll.h generic-y += resource.h +generic-y += sockios.h diff --git a/arch/parisc/include/uapi/asm/sockios.h b/arch/parisc/include/uapi/asm/sockios.h deleted file mode 100644 index 66a3ba64d53f..000000000000 --- a/arch/parisc/include/uapi/asm/sockios.h +++ /dev/null @@ -1,14 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -#ifndef __ARCH_PARISC_SOCKIOS__ -#define __ARCH_PARISC_SOCKIOS__ - -/* Socket-level I/O control calls. */ -#define FIOSETOWN 0x8901 -#define SIOCSPGRP 0x8902 -#define FIOGETOWN 0x8903 -#define SIOCGPGRP 0x8904 -#define SIOCATMARK 0x8905 -#define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */ -#define SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */ - -#endif diff --git a/arch/sparc/include/uapi/asm/Kbuild b/arch/sparc/include/uapi/asm/Kbuild index 4680ba246b55..8fdae51d0eae 100644 --- a/arch/sparc/include/uapi/asm/Kbuild +++ b/arch/sparc/include/uapi/asm/Kbuild @@ -2,4 +2,5 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += bpf_perf_event.h +generic-y += sockios.h generic-y += types.h diff --git a/arch/sparc/include/uapi/asm/sockios.h b/arch/sparc/include/uapi/asm/sockios.h deleted file mode 100644 index 18a3ec14a847..000000000000 --- a/arch/sparc/include/uapi/asm/sockios.h +++ /dev/null @@ -1,15 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -#ifndef _ASM_SPARC_SOCKIOS_H -#define _ASM_SPARC_SOCKIOS_H - -/* Socket-level I/O control calls. */ -#define FIOSETOWN 0x8901 -#define SIOCSPGRP 0x8902 -#define FIOGETOWN 0x8903 -#define SIOCGPGRP 0x8904 -#define SIOCATMARK 0x8905 -#define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */ -#define SIOCGSTAMPNS 0x8907 /* Get stamp (timespec) */ - -#endif /* !(_ASM_SPARC_SOCKIOS_H) */ - diff --git a/arch/x86/include/uapi/asm/Kbuild b/arch/x86/include/uapi/asm/Kbuild index 322681622d1e..1d489e6b237e 100644 --- a/arch/x86/include/uapi/asm/Kbuild +++ b/arch/x86/include/uapi/asm/Kbuild @@ -6,3 +6,4 @@ generated-y += unistd_32.h generated-y += unistd_64.h generated-y += unistd_x32.h generic-y += poll.h +generic-y += sockios.h diff --git a/arch/x86/include/uapi/asm/sockios.h b/arch/x86/include/uapi/asm/sockios.h deleted file mode 100644 index def6d4746ee7..000000000000 --- a/arch/x86/include/uapi/asm/sockios.h +++ /dev/null @@ -1 +0,0 @@ -#include