Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Move COMPAT_ATM_ADDPARTY to net/atm/svc.c

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 <palmer@dabbelt.com>
Reviewed-by: Andrew Waterman <waterman@eecs.berkeley.edu>
Reviewed-by: Albert Ou <aou@eecs.berkeley.edu>
Message-Id: <1447119071-19392-4-git-send-email-palmer@dabbelt.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

authored by

Palmer Dabbelt and committed by
Arnd Bergmann
5fe5a758 fe15c26e

+5 -4
-4
include/uapi/linux/atmdev.h
··· 101 101 /* use backend to make new if */ 102 102 #define ATM_ADDPARTY _IOW('a', ATMIOC_SPECIAL+4,struct atm_iobuf) 103 103 /* add party to p2mp call */ 104 - #ifdef CONFIG_COMPAT 105 - /* It actually takes struct sockaddr_atmsvc, not struct atm_iobuf */ 106 - #define COMPAT_ATM_ADDPARTY _IOW('a', ATMIOC_SPECIAL+4,struct compat_atm_iobuf) 107 - #endif 108 104 #define ATM_DROPPARTY _IOW('a', ATMIOC_SPECIAL+5,int) 109 105 /* drop party from p2mp call */ 110 106
+5
net/atm/svc.c
··· 28 28 #include "signaling.h" 29 29 #include "addr.h" 30 30 31 + #ifdef CONFIG_COMPAT 32 + /* It actually takes struct sockaddr_atmsvc, not struct atm_iobuf */ 33 + #define COMPAT_ATM_ADDPARTY _IOW('a', ATMIOC_SPECIAL + 4, struct compat_atm_iobuf) 34 + #endif 35 + 31 36 static int svc_create(struct net *net, struct socket *sock, int protocol, 32 37 int kern); 33 38