diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/init.h | 1 | ||||
-rw-r--r-- | include/net/net_namespace.h | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/init.h b/include/linux/init.h index 74b1f43bf982..f8d9d0b5cffc 100644 --- a/include/linux/init.h +++ b/include/linux/init.h | |||
@@ -57,6 +57,7 @@ | |||
57 | * The markers follow same syntax rules as __init / __initdata. */ | 57 | * The markers follow same syntax rules as __init / __initdata. */ |
58 | #define __init_refok noinline __attribute__ ((__section__ (".text.init.refok"))) | 58 | #define __init_refok noinline __attribute__ ((__section__ (".text.init.refok"))) |
59 | #define __initdata_refok __attribute__ ((__section__ (".data.init.refok"))) | 59 | #define __initdata_refok __attribute__ ((__section__ (".data.init.refok"))) |
60 | #define __exit_refok noinline __attribute__ ((__section__ (".exit.text.refok"))) | ||
60 | 61 | ||
61 | #ifdef MODULE | 62 | #ifdef MODULE |
62 | #define __exit __attribute__ ((__section__(".exit.text"))) __cold | 63 | #define __exit __attribute__ ((__section__(".exit.text"))) __cold |
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index 934c840b5941..93aa87d32804 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h | |||
@@ -99,6 +99,15 @@ static inline void release_net(struct net *net) | |||
99 | #define for_each_net(VAR) \ | 99 | #define for_each_net(VAR) \ |
100 | list_for_each_entry(VAR, &net_namespace_list, list) | 100 | list_for_each_entry(VAR, &net_namespace_list, list) |
101 | 101 | ||
102 | #ifdef CONFIG_NET_NS | ||
103 | #define __net_init | ||
104 | #define __net_exit | ||
105 | #define __net_initdata | ||
106 | #else | ||
107 | #define __net_init __init | ||
108 | #define __net_exit __exit_refok | ||
109 | #define __net_initdata __initdata | ||
110 | #endif | ||
102 | 111 | ||
103 | struct pernet_operations { | 112 | struct pernet_operations { |
104 | struct list_head list; | 113 | struct list_head list; |