diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /net/ipv6/xfrm6_policy.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'net/ipv6/xfrm6_policy.c')
| -rw-r--r-- | net/ipv6/xfrm6_policy.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c index 8ec3d45cd1d9..7254e3f899a7 100644 --- a/net/ipv6/xfrm6_policy.c +++ b/net/ipv6/xfrm6_policy.c | |||
| @@ -309,7 +309,6 @@ static void xfrm6_policy_fini(void) | |||
| 309 | #ifdef CONFIG_SYSCTL | 309 | #ifdef CONFIG_SYSCTL |
| 310 | static struct ctl_table xfrm6_policy_table[] = { | 310 | static struct ctl_table xfrm6_policy_table[] = { |
| 311 | { | 311 | { |
| 312 | .ctl_name = CTL_UNNUMBERED, | ||
| 313 | .procname = "xfrm6_gc_thresh", | 312 | .procname = "xfrm6_gc_thresh", |
| 314 | .data = &xfrm6_dst_ops.gc_thresh, | 313 | .data = &xfrm6_dst_ops.gc_thresh, |
| 315 | .maxlen = sizeof(int), | 314 | .maxlen = sizeof(int), |