diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-01-15 12:56:22 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-01-16 12:56:30 +0100 |
| commit | 63a2ed3ba5bca13db3029e6eb8aa0c35872b73b9 (patch) | |
| tree | 9e1ab8b617c8135c9702a084d8698bd26e4329fa /target/linux/generic/backport-4.9/024-7-net-reorganize-struct-sock-for-better-data-locality.patch | |
| parent | 5be22ef2faad0cfb26ee38fe589c791c67444533 (diff) | |
| download | upstream-63a2ed3ba5bca13db3029e6eb8aa0c35872b73b9.tar.gz upstream-63a2ed3ba5bca13db3029e6eb8aa0c35872b73b9.tar.bz2 upstream-63a2ed3ba5bca13db3029e6eb8aa0c35872b73b9.zip | |
kernel: bump 4.9 to 4.9.150
Refreshed all patches.
Remove upstreamed:
- 096-mips-math-emu-Write-protect-delay-slot-emulation-pages.patch
Altered patches:
- 024-7-net-reorganize-struct-sock-for-better-data-locality.patch
Compile-tested on: ar7
Runtime-tested on: none
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/backport-4.9/024-7-net-reorganize-struct-sock-for-better-data-locality.patch')
| -rw-r--r-- | target/linux/generic/backport-4.9/024-7-net-reorganize-struct-sock-for-better-data-locality.patch | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/target/linux/generic/backport-4.9/024-7-net-reorganize-struct-sock-for-better-data-locality.patch b/target/linux/generic/backport-4.9/024-7-net-reorganize-struct-sock-for-better-data-locality.patch index e8c1915e18..a43b4037fe 100644 --- a/target/linux/generic/backport-4.9/024-7-net-reorganize-struct-sock-for-better-data-locality.patch +++ b/target/linux/generic/backport-4.9/024-7-net-reorganize-struct-sock-for-better-data-locality.patch @@ -52,7 +52,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> --- a/include/net/sock.h +++ b/include/net/sock.h -@@ -343,6 +343,9 @@ struct sock { +@@ -344,6 +344,9 @@ struct sock { #define sk_rxhash __sk_common.skc_rxhash socket_lock_t sk_lock; @@ -62,7 +62,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> struct sk_buff_head sk_receive_queue; /* * The backlog queue is special, it is always used with -@@ -359,14 +362,13 @@ struct sock { +@@ -360,14 +363,13 @@ struct sock { struct sk_buff *tail; } sk_backlog; #define sk_rmem_alloc sk_backlog.rmem_alloc @@ -80,7 +80,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> int sk_rcvbuf; struct sk_filter __rcu *sk_filter; -@@ -379,11 +381,30 @@ struct sock { +@@ -380,11 +382,30 @@ struct sock { #endif struct dst_entry *sk_rx_dst; struct dst_entry __rcu *sk_dst_cache; @@ -113,7 +113,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> /* * Because of non atomicity rules, all -@@ -399,41 +420,23 @@ struct sock { +@@ -400,31 +421,17 @@ struct sock { #define SK_PROTOCOL_MAX U8_MAX kmemcheck_bitfield_end(flags); @@ -143,8 +143,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net> - long sk_sndtimeo; - struct timer_list sk_timer; ktime_t sk_stamp; - u16 sk_tsflags; - u8 sk_shutdown; + #if BITS_PER_LONG==32 + seqlock_t sk_stamp_seq; +@@ -434,10 +441,6 @@ struct sock { u32 sk_tskey; struct socket *sk_socket; void *sk_user_data; |