diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-10 12:50:55 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-10 13:30:46 -0400 |
| commit | de4d195308ad589626571dbe5789cebf9695a204 (patch) | |
| tree | 77a6bd6946594ea4e7513aaa73009295530960a1 /net/ipv6/tcp_ipv6.c | |
| parent | dc9edaab90de9441cc28ac570b23b0d2bdba7879 (diff) | |
| parent | 20652ed6e44f4963281b65209b917be86ac6765b (diff) | |
Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull RCU updates from Ingo Molnar:
"The main changes are:
- Debloat RCU headers
- Parallelize SRCU callback handling (plus overlapping patches)
- Improve the performance of Tree SRCU on a CPU-hotplug stress test
- Documentation updates
- Miscellaneous fixes"
* 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (74 commits)
rcu: Open-code the rcu_cblist_n_lazy_cbs() function
rcu: Open-code the rcu_cblist_n_cbs() function
rcu: Open-code the rcu_cblist_empty() function
rcu: Separately compile large rcu_segcblist functions
srcu: Debloat the <linux/rcu_segcblist.h> header
srcu: Adjust default auto-expediting holdoff
srcu: Specify auto-expedite holdoff time
srcu: Expedite first synchronize_srcu() when idle
srcu: Expedited grace periods with reduced memory contention
srcu: Make rcutorture writer stalls print SRCU GP state
srcu: Exact tracking of srcu_data structures containing callbacks
srcu: Make SRCU be built by default
srcu: Fix Kconfig botch when SRCU not selected
rcu: Make non-preemptive schedule be Tasks RCU quiescent state
srcu: Expedite srcu_schedule_cbs_snp() callback invocation
srcu: Parallelize callback handling
kvm: Move srcu_struct fields to end of struct kvm
rcu: Fix typo in PER_RCU_NODE_PERIOD header comment
rcu: Use true/false in assignment to bool
rcu: Use bool value directly
...
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
| -rw-r--r-- | net/ipv6/tcp_ipv6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index aeb9497b5bb7..7a8237acd210 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
| @@ -1917,7 +1917,7 @@ struct proto tcpv6_prot = { | |||
| 1917 | .sysctl_rmem = sysctl_tcp_rmem, | 1917 | .sysctl_rmem = sysctl_tcp_rmem, |
| 1918 | .max_header = MAX_TCP_HEADER, | 1918 | .max_header = MAX_TCP_HEADER, |
| 1919 | .obj_size = sizeof(struct tcp6_sock), | 1919 | .obj_size = sizeof(struct tcp6_sock), |
| 1920 | .slab_flags = SLAB_DESTROY_BY_RCU, | 1920 | .slab_flags = SLAB_TYPESAFE_BY_RCU, |
| 1921 | .twsk_prot = &tcp6_timewait_sock_ops, | 1921 | .twsk_prot = &tcp6_timewait_sock_ops, |
| 1922 | .rsk_prot = &tcp6_request_sock_ops, | 1922 | .rsk_prot = &tcp6_request_sock_ops, |
| 1923 | .h.hashinfo = &tcp_hashinfo, | 1923 | .h.hashinfo = &tcp_hashinfo, |