Commit 022cbae6 authored by Denis V. Lunev's avatar Denis V. Lunev Committed by David S. Miller
Browse files

[NET]: Move unneeded data to initdata section. 



This patch reverts Eric's commit 2b008b0a

It diets .text & .data section of the kernel if CONFIG_NET_NS is not set.
This is safe after list operations cleanup.

Signed-of-by: default avatarDenis V. Lunev <den@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ed160e83

drivers/net/loopback.c

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ static __net_exit void loopback_net_exit(struct net *net) 
	unregister_netdev(dev);

}



static struct pernet_operations loopback_net_ops = {

static struct pernet_operations __net_initdata loopback_net_ops = {

       .init = loopback_net_init,

       .exit = loopback_net_exit,

};

fs/proc/proc_net.c

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ static __net_exit void proc_net_ns_exit(struct net *net) 
	kfree(net->proc_net_root);

}



static struct pernet_operations proc_net_ns_ops = {

static struct pernet_operations __net_initdata proc_net_ns_ops = {

	.init = proc_net_ns_init,

	.exit = proc_net_ns_exit,

};

include/net/net_namespace.h

+2 −0
Original line number Diff line number Diff line
@@ -119,9 +119,11 @@ static inline struct net *maybe_get_net(struct net *net) 
#ifdef CONFIG_NET_NS

#define __net_init

#define __net_exit

#define __net_initdata

#else

#define __net_init	__init

#define __net_exit	__exit_refok

#define __net_initdata	__initdata

#endif



struct pernet_operations {

net/core/dev.c

+3 −3
Original line number Diff line number Diff line
@@ -2688,7 +2688,7 @@ static void __net_exit dev_proc_net_exit(struct net *net) 
	proc_net_remove(net, "dev");

}



static struct pernet_operations dev_proc_ops = {

static struct pernet_operations __net_initdata dev_proc_ops = {

	.init = dev_proc_net_init,

	.exit = dev_proc_net_exit,

};
@@ -4353,7 +4353,7 @@ static void __net_exit netdev_exit(struct net *net) 
	kfree(net->dev_index_head);

}



static struct pernet_operations  netdev_net_ops = {

static struct pernet_operations __net_initdata netdev_net_ops = {

	.init = netdev_init,

	.exit = netdev_exit,

};
@@ -4384,7 +4384,7 @@ static void __net_exit default_device_exit(struct net *net) 
	rtnl_unlock();

}



static struct pernet_operations  default_device_ops = {

static struct pernet_operations __net_initdata default_device_ops = {

	.exit = default_device_exit,

};

net/core/dev_mcast.c

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ static void __net_exit dev_mc_net_exit(struct net *net) 
	proc_net_remove(net, "dev_mcast");

}



static struct pernet_operations dev_mc_net_ops = {

static struct pernet_operations __net_initdata dev_mc_net_ops = {

	.init = dev_mc_net_init,

	.exit = dev_mc_net_exit,

};