lkml.org 
[lkml]   [2018]   [Aug]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH net-next 2/3] asm-generic: generalize asm/sockios.h
    Date
    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 <arnd@arndb.de>
    ---
    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

    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 <asm-i386/sockios.h>.
    - *
    - * Modified 1998, 1999
    - * David Mosberger-Tang <davidm@hpl.hp.com>, 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 <asm-generic/sockios.h>
    --
    2.18.0
    \
     
     \ /
      Last update: 2018-08-29 15:06    [W:3.090 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site