From patchwork Fri May 26 08:32:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 767327 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wYztd62C3z9s7y for ; Fri, 26 May 2017 18:33:45 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="It+wgMwT"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3wYztd4xB7zDqTY for ; Fri, 26 May 2017 18:33:45 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="It+wgMwT"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3wYzsB3DhMzDqT2 for ; Fri, 26 May 2017 18:32:30 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="It+wgMwT"; dkim-atps=neutral Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 3wYzsB14TYz9s7y; Fri, 26 May 2017 18:32:30 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1495787550; bh=O2dfJ72CIXxJ1vIrCRw1CAdyK7C7HDInw7kMnMe82is=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=It+wgMwTIJjzL2qjlJ5DGXVBXg+Xfl3OVyQTYV2eUQrwNAU+z7zo3s/GPwDuVuYyf uL5WpiKp3L0pDEp4EUxYqg9/Or4nVN0eK/WIMjI5HlFR2lJFq0GFMZ3LxGp4wY2tgv fO1sQ4K2xwTmGBRvJqj7i+LBvG2g2mrVAWXfP+x/mEJWzHtMyam/0u44XUjbQWOReJ H2rvU8W/P0Szh5lgiPnb/Fw6G/d6jRqfanxe+JpyyZ9l184KP/Y9qU/Bt4XrUKSSR/ ZEe2LkBXdItV+F7GF/9h1h5yK84+nBajyKTqZGiJCff3Dzm4PTngPbSPFeLJkC8+Qe B3R+5nTTjfNPA== Date: Fri, 26 May 2017 18:32:29 +1000 From: Stephen Rothwell To: Michael Ellerman Subject: [PATCH] powerpc: use uapi/asm-generic/sockios.h Message-ID: <20170526183229.193ef0eb@canb.auug.org.au> In-Reply-To: <20170526161946.7bf423c4@canb.auug.org.au> References: <20170526161946.7bf423c4@canb.auug.org.au> MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ppc-dev Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Hi all, The arch version is identical except for comments and white space. Signed-off-by: Stephen Rothwell Acked-by: Arnd Bergmann --- arch/powerpc/include/uapi/asm/Kbuild | 1 + arch/powerpc/include/uapi/asm/sockios.h | 20 -------------------- 2 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 arch/powerpc/include/uapi/asm/sockios.h This follows on from my previous "powerpc: use the asm-genric versions of some uapi includes". diff --git a/arch/powerpc/include/uapi/asm/Kbuild b/arch/powerpc/include/uapi/asm/Kbuild index 9aba4af4122e..0d960ef78a9a 100644 --- a/arch/powerpc/include/uapi/asm/Kbuild +++ b/arch/powerpc/include/uapi/asm/Kbuild @@ -4,4 +4,5 @@ include include/uapi/asm-generic/Kbuild.asm generic-y += param.h generic-y += poll.h generic-y += resource.h +generic-y += sockios.h generic-y += statfs.h diff --git a/arch/powerpc/include/uapi/asm/sockios.h b/arch/powerpc/include/uapi/asm/sockios.h deleted file mode 100644 index 55cef7675a31..000000000000 --- a/arch/powerpc/include/uapi/asm/sockios.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef _ASM_POWERPC_SOCKIOS_H -#define _ASM_POWERPC_SOCKIOS_H - -/* - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version - * 2 of the License, or (at your option) any later version. - */ - -/* 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_POWERPC_SOCKIOS_H */