o NET: move net/socket.c EXPORT_SYMBOLs from net/netsyms.c

diff --git a/net/netsyms.c b/net/netsyms.c
index 7f42d80cee8970e542882a15ce5b8c699fdb8f64..edf84e5bc7f66084588a8687ebb20b8422c4f955 100644 (file)
--- a/net/netsyms.c
+++ b/net/netsyms.c
@@ -92,21 +92,9 @@ extern void destroy_8023_client(struct datalink_proto *);
 extern int sysctl_max_syn_backlog;
 #endif
 
-/* Socket layer registration */
-EXPORT_SYMBOL(sock_register);
-EXPORT_SYMBOL(sock_unregister);
-
-/* Socket locking */
-
 /* Socket layer support routines */
 EXPORT_SYMBOL(memcpy_fromiovec);
 EXPORT_SYMBOL(memcpy_tokerneliovec);
-EXPORT_SYMBOL(sock_create);
-EXPORT_SYMBOL(sock_alloc);
-EXPORT_SYMBOL(sock_release);
-EXPORT_SYMBOL(sock_sendmsg);
-EXPORT_SYMBOL(sock_recvmsg);
-EXPORT_SYMBOL(sock_wake_async);
 EXPORT_SYMBOL(skb_recv_datagram);
 EXPORT_SYMBOL(skb_free_datagram);
 EXPORT_SYMBOL(skb_copy_datagram);
@@ -114,8 +102,6 @@ EXPORT_SYMBOL(skb_copy_datagram_iovec);
 EXPORT_SYMBOL(skb_copy_and_csum_datagram_iovec);
 EXPORT_SYMBOL(datagram_poll);
 EXPORT_SYMBOL(put_cmsg);
-EXPORT_SYMBOL(sock_map_fd);
-EXPORT_SYMBOL(sockfd_lookup);
 
 EXPORT_SYMBOL(sk_run_filter);
 EXPORT_SYMBOL(sk_chk_filter);
@@ -287,10 +273,6 @@ EXPORT_SYMBOL(rtattr_parse);
 EXPORT_SYMBOL(__rta_fill);
 
 
-/* ABI emulation layers need this */
-EXPORT_SYMBOL(move_addr_to_kernel);
-EXPORT_SYMBOL(move_addr_to_user);
-                  
 /* Used by at least ipip.c.  */
 EXPORT_SYMBOL(ipv4_config);
 

diff --git a/net/socket.c b/net/socket.c
index f0a1a3da7500b20d7e266139dc8585d4b53224fc..42cf94ca61c230aa8c6ab2721a0289bb78bfe063 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -1989,3 +1989,18 @@ void socket_seq_show(struct seq_file *seq)
        seq_printf(seq, "sockets: used %d\n", counter);
 }
 #endif /* CONFIG_PROC_FS */
+
+/* ABI emulation layers need these two */
+EXPORT_SYMBOL(move_addr_to_kernel);
+EXPORT_SYMBOL(move_addr_to_user);
+EXPORT_SYMBOL(sock_alloc);
+EXPORT_SYMBOL(sock_alloc_inode);
+EXPORT_SYMBOL(sock_create);
+EXPORT_SYMBOL(sock_map_fd);
+EXPORT_SYMBOL(sock_recvmsg);
+EXPORT_SYMBOL(sock_register);
+EXPORT_SYMBOL(sock_release);
+EXPORT_SYMBOL(sock_sendmsg);
+EXPORT_SYMBOL(sock_unregister);
+EXPORT_SYMBOL(sock_wake_async);
+EXPORT_SYMBOL(sockfd_lookup);