diff options
| author |   David S. Miller <davem@davemloft.net> | 2010-05-31 23:44:57 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-31 23:44:57 -0700 |
| commit | 5953a303471951a4c2f2127f0b4c74df7ceb7ac2 (patch) | |
| tree | 13b51217a6f538fe5c72821b1ee65d9bfea72842 /include/linux | |
| parent | net: sock_queue_err_skb() dont mess with sk_forward_alloc (diff) | |
| parent | netfilter: xtables: stackptr should be percpu (diff) | |
| download | linux-dev-5953a303471951a4c2f2127f0b4c74df7ceb7ac2.tar.xz linux-dev-5953a303471951a4c2f2127f0b4c74df7ceb7ac2.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/netfilter/x_tables.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h index c00cc0c4d0b7..24e5d01d27d0 100644 --- a/include/linux/netfilter/x_tables.h +++ b/include/linux/netfilter/x_tables.h @@ -397,7 +397,7 @@ struct xt_table_info { * @stacksize jumps (number of user chains) can possibly be made. */ unsigned int stacksize; - unsigned int *stackptr; + unsigned int __percpu *stackptr; void ***jumpstack; /* ipt_entry tables: one per CPU */ /* Note : this field MUST be the last one, see XT_TABLE_INFO_SZ */ |