diff options
| author | Florian Westphal | 2016-04-24 01:17:14 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso | 2016-04-29 11:27:10 +0200 |
| commit | 70d72b7e060e0a16b9ded9d0fbd3dff109743de3 (patch) | |
| tree | 90756f193f1a1174c7f6d85add6af62c36292650 /net/netfilter/nf_conntrack_core.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | kernel-qcow2-linux-70d72b7e060e0a16b9ded9d0fbd3dff109743de3.tar.gz kernel-qcow2-linux-70d72b7e060e0a16b9ded9d0fbd3dff109743de3.tar.xz kernel-qcow2-linux-70d72b7e060e0a16b9ded9d0fbd3dff109743de3.zip | |
netfilter: conntrack: init all_locks to avoid debug warning
Else we get 'BUG: spinlock bad magic on CPU#' on resize when
spin lock debugging is enabled.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/nf_conntrack_core.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index afde5f5e728a..895d11dced3c 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c @@ -66,7 +66,7 @@ EXPORT_SYMBOL_GPL(nf_conntrack_locks); __cacheline_aligned_in_smp DEFINE_SPINLOCK(nf_conntrack_expect_lock); EXPORT_SYMBOL_GPL(nf_conntrack_expect_lock); -static __read_mostly spinlock_t nf_conntrack_locks_all_lock; +static __read_mostly DEFINE_SPINLOCK(nf_conntrack_locks_all_lock); static __read_mostly bool nf_conntrack_locks_all; void nf_conntrack_lock(spinlock_t *lock) __acquires(lock) |