From d5d20912d33f13766902a27087323f5c94e831c8 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Mon, 17 Mar 2014 13:37:53 -0700 Subject: [PATCH] netfilter: conntrack: Fix UP builds ARRAY_SIZE(nf_conntrack_locks) is undefined if spinlock_t is an empty structure. Replace it by CONNTRACK_LOCKS Fixes: 93bb0ceb75be ("netfilter: conntrack: remove central spinlock nf_conntrack_lock") Reported-by: kbuild test robot Signed-off-by: Eric Dumazet Cc: Jesper Dangaard Brouer Cc: Pablo Neira Ayuso Signed-off-by: David S. Miller --- net/netfilter/nf_conntrack_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index 5d1e7d126ebd..6dba48efe01e 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c @@ -1674,7 +1674,7 @@ int nf_conntrack_init_start(void) int max_factor = 8; int i, ret, cpu; - for (i = 0; i < ARRAY_SIZE(nf_conntrack_locks); i++) + for (i = 0; i < CONNTRACK_LOCKS; i++) spin_lock_init(&nf_conntrack_locks[i]); /* Idea from tcp.c: use 1/16384 of memory. On i386: 32MB