summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-05-31 23:44:57 -0700
committerDavid S. Miller <davem@davemloft.net>2010-05-31 23:44:57 -0700
commit5953a303471951a4c2f2127f0b4c74df7ceb7ac2 (patch)
tree13b51217a6f538fe5c72821b1ee65d9bfea72842 /include
parentb1faf5666438090a4dc4fceac8502edc7788b7e3 (diff)
parent7489aec8eed4f2f1eb3b4d35763bd3ea30b32ef5 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'include')
-rw-r--r--include/linux/netfilter/x_tables.h2
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 */