From patchwork Tue Nov 10 01:31:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 7587531 Return-Path: X-Original-To: patchwork-linux-fsdevel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D89C8C05C6 for ; Tue, 10 Nov 2015 01:37:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E6A552068C for ; Tue, 10 Nov 2015 01:37:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0CE95205E1 for ; Tue, 10 Nov 2015 01:37:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752442AbbKJBhp (ORCPT ); Mon, 9 Nov 2015 20:37:45 -0500 Received: from mail-pa0-f54.google.com ([209.85.220.54]:35443 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752148AbbKJBbt (ORCPT ); Mon, 9 Nov 2015 20:31:49 -0500 Received: by pasz6 with SMTP id z6so223479479pas.2 for ; Mon, 09 Nov 2015 17:31:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dabbelt_com.20150623.gappssmtp.com; s=20150623; h=from:to:to:to:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc :cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:subject :date:message-id:in-reply-to:references; bh=e0qHFw7wpIjEUsoHYRTY4ZfAuBqn4vb6PEk30RGIsE8=; b=dGX/nN0jHOc48IUE/F26wzkUDDUKIMrN/MAMF/Z2Dxc9p2IVEJeiaiyYcGR7OSepoH h9/tEwA+AIrajKr0wbqaQeLS9uRM0hgXEsGQjtb7HDrdjMDRcUkCmIvSd2rYwr4clcXk Jfo7K08YwxrEm/iTNs1p0qVu7qwnIUrXhNWF+sSc+qspuN+RfR+XDjwoZMnxumjWDdha aQ3HViTk8wk5eHemy8GkWoguh1kxAVQo6VA+TNqEUbUWjFBuZkFmOGmsRvDLn0UQpqWi VpwfO7TY8g7LAdOiDbd9Dv3yTCL2CoeB08LvglvFRBiKCKBAYdLUtOto+wTWh6BCi9+m giLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:to:to:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc :cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc:cc :cc:cc:cc:cc:subject:date:message-id:in-reply-to:references; bh=e0qHFw7wpIjEUsoHYRTY4ZfAuBqn4vb6PEk30RGIsE8=; b=VI85e6f3OUvWv1bMfz6nt2Ed3glp2bwPrisNZdM6By1M65oVX+gkz9Y+PjtT8qpzIH 7BxxRo7xMGj/OZO8+jy/0FvENzGr/0gFY83WIlWC6kZDEFpKQOSJwaO4m9lay+IaKuy9 ZTdsJRaGv/7390By0gheGQ3NShVD4mZ//vw/cB3Hv16powb1fANoYIPZZRyDi1yL/PIn AOqbvQHamMf+/hKz21Bo20WHbz5m1tF6YQ9M2ReDBF+TL/g2AwczEYd5K9LB8hTtkfi9 87rLxChMir3/7VWVlkXGyC0WZ2eh82X6UyQb1xDox6oNL34XKzVmbCU2m8Z6kVi1YwRz F84Q== X-Gm-Message-State: ALoCoQl7yLt62TUtsgtEovtvSZU5BbljdPSh2PQGDX1DakP2pXcv6raTlwOQc0Yw60hy67CSnbqT X-Received: by 10.66.122.39 with SMTP id lp7mr1571411pab.74.1447119109039; Mon, 09 Nov 2015 17:31:49 -0800 (PST) Received: from localhost (wap-cal.CS.Berkeley.EDU. [128.32.35.228]) by smtp.gmail.com with ESMTPSA id u10sm590845pbs.63.2015.11.09.17.31.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Nov 2015 17:31:48 -0800 (PST) From: Palmer Dabbelt To: arnd@arndb.de To: dhowells@redhat.com To: peterz@infradead.org Cc: viro@zeniv.linux.org.uk Cc: ast@plumgrid.com Cc: aishchuk@linux.vnet.ibm.com Cc: aarcange@redhat.com Cc: akpm@linux-foundation.org Cc: luto@kernel.org Cc: acme@kernel.org Cc: bhe@redhat.com Cc: 3chas3@gmail.com Cc: chris@zankel.net Cc: dave@sr71.net Cc: dyoung@redhat.com Cc: drysdale@google.com Cc: davem@davemloft.net Cc: ebiederm@xmission.com Cc: geoff@infradead.org Cc: gregkh@linuxfoundation.org Cc: hpa@zytor.com Cc: mingo@kernel.org Cc: iulia.manda21@gmail.com Cc: plagnioj@jcrosoft.com Cc: jikos@kernel.org Cc: josh@joshtriplett.org Cc: linux-api@vger.kernel.org Cc: linux-arch@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: linux-xtensa@linux-xtensa.org Cc: mathieu.desnoyers@efficios.com Cc: jcmvbkbc@gmail.com Cc: paulmck@linux.vnet.ibm.com Cc: a.p.zijlstra@chello.nl Cc: tglx@linutronix.de Cc: tomi.valkeinen@ti.com Cc: vgoyal@redhat.com Cc: x86@kernel.org Cc: Palmer Dabbelt Subject: [PATCH 03/14] Move COMPAT_ATM_ADDPARTY to net/atm/svc.c Date: Mon, 9 Nov 2015 17:31:00 -0800 Message-Id: <1447119071-19392-4-git-send-email-palmer@dabbelt.com> X-Mailer: git-send-email 2.4.10 In-Reply-To: <1447119071-19392-1-git-send-email-palmer@dabbelt.com> References: <1446579994-9937-1-git-send-email-palmer@dabbelt.com> <1447119071-19392-1-git-send-email-palmer@dabbelt.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This used to be behind an #ifdef COMPAT_COMPAT, so most of userspace wouldn't have seen the definition before. Unfortunately this header file became visible to userspace, so the definition has instead been moved to net/atm/svc.c (the only user). Signed-off-by: Palmer Dabbelt Reviewed-by: Andrew Waterman Reviewed-by: Albert Ou Reviewed-by: Arnd Bergmann --- include/uapi/linux/atmdev.h | 4 ---- net/atm/svc.c | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/uapi/linux/atmdev.h b/include/uapi/linux/atmdev.h index 93e0ec0..3dcec70 100644 --- a/include/uapi/linux/atmdev.h +++ b/include/uapi/linux/atmdev.h @@ -100,10 +100,6 @@ struct atm_dev_stats { /* use backend to make new if */ #define ATM_ADDPARTY _IOW('a', ATMIOC_SPECIAL+4,struct atm_iobuf) /* add party to p2mp call */ -#ifdef CONFIG_COMPAT -/* It actually takes struct sockaddr_atmsvc, not struct atm_iobuf */ -#define COMPAT_ATM_ADDPARTY _IOW('a', ATMIOC_SPECIAL+4,struct compat_atm_iobuf) -#endif #define ATM_DROPPARTY _IOW('a', ATMIOC_SPECIAL+5,int) /* drop party from p2mp call */ diff --git a/net/atm/svc.c b/net/atm/svc.c index 3fa0a9e..9e2e6ef 100644 --- a/net/atm/svc.c +++ b/net/atm/svc.c @@ -27,6 +27,11 @@ #include "signaling.h" #include "addr.h" +#ifdef CONFIG_COMPAT +/* It actually takes struct sockaddr_atmsvc, not struct atm_iobuf */ +#define COMPAT_ATM_ADDPARTY _IOW('a', ATMIOC_SPECIAL+4, struct compat_atm_iobuf) +#endif + static int svc_create(struct net *net, struct socket *sock, int protocol, int kern);