diff options
| author | Andi Kleen <ak@linux.intel.com> | 2012-10-05 02:12:11 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-05 20:04:45 +0200 |
| commit | 04a6f82cf01aeef9fb058b2fca0ef1fe0a09c2fa (patch) | |
| tree | d9fb34c24277a6eec6f5da9aeff450aedb8e387c /include | |
| parent | sections: fix section conflicts in net/can (diff) | |
| download | linux-04a6f82cf01aeef9fb058b2fca0ef1fe0a09c2fa.tar.xz linux-04a6f82cf01aeef9fb058b2fca0ef1fe0a09c2fa.zip | |
sections: fix section conflicts in net
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/net_namespace.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index 4faf6612ecac..95e646641184 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h @@ -257,10 +257,12 @@ static inline struct net *read_pnet(struct net * const *pnet) #define __net_init #define __net_exit #define __net_initdata +#define __net_initconst #else #define __net_init __init #define __net_exit __exit_refok #define __net_initdata __initdata +#define __net_initconst __initconst #endif struct pernet_operations { |