aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-4.9/024-7-net-reorganize-struct-sock-for-better-data-locality.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-01-15 11:57:34 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-01-15 13:58:36 +0100
commitcae263227ffdec1bd0d005b7752f25b6ebc6f8fa (patch)
tree08002c46c1c5c0537bf6daa2bad0c81d1204b419 /target/linux/generic/backport-4.9/024-7-net-reorganize-struct-sock-for-better-data-locality.patch
parentf34ad1a8f0d1ee4a3e4b966d58c8f3b8a523a417 (diff)
downloadupstream-cae263227ffdec1bd0d005b7752f25b6ebc6f8fa.tar.gz
upstream-cae263227ffdec1bd0d005b7752f25b6ebc6f8fa.tar.bz2
upstream-cae263227ffdec1bd0d005b7752f25b6ebc6f8fa.zip
kernel: bump 4.9 to 4.9.150
Refreshed all patches. Remove upstreamed: - 510-f2fs-fix-sanity_check_raw_super-on-big-endian-machines.patch Altered patches: - 024-7-net-reorganize-struct-sock-for-better-data-locality.patch Compile-tested on: ar71xx Runtime-tested on: ar71xx 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.patch13
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;