diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-03-04 11:54:09 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-03-04 11:54:09 +0100 |
| commit | 3c94ba5267e64a9212acd2f9e08d3f726d8e5aa0 (patch) | |
| tree | a2325b7a66100a50653fbecc41316e28b902c06c /net/ipv4/tcp.c | |
| parent | 47403a4b49767f1d533e4dc5f5cf5cc957f22a5e (diff) | |
| parent | 90d35da658da8cff0d4ecbb5113f5fac9d00eb72 (diff) | |
| download | linux-stable-3c94ba5267e64a9212acd2f9e08d3f726d8e5aa0.tar.gz linux-stable-3c94ba5267e64a9212acd2f9e08d3f726d8e5aa0.tar.bz2 linux-stable-3c94ba5267e64a9212acd2f9e08d3f726d8e5aa0.zip | |
Merge tag 'v6.8-rc7' into x86/cleanups, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/ipv4/tcp.c')
| -rw-r--r-- | net/ipv4/tcp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 7e2481b9eae1..c82dc42f57c6 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -4615,7 +4615,8 @@ static void __init tcp_struct_check(void) CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_txrx, prr_out); CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_txrx, lost_out); CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_txrx, sacked_out); - CACHELINE_ASSERT_GROUP_SIZE(struct tcp_sock, tcp_sock_read_txrx, 31); + CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_txrx, scaling_ratio); + CACHELINE_ASSERT_GROUP_SIZE(struct tcp_sock, tcp_sock_read_txrx, 32); /* RX read-mostly hotpath cache lines */ CACHELINE_ASSERT_GROUP_MEMBER(struct tcp_sock, tcp_sock_read_rx, copied_seq); |