diff options
| author |   Eric Dumazet <eric.dumazet@gmail.com> | 2009-10-08 22:50:25 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2009-10-11 23:03:52 -0700 |
| commit | 5fdb9973c10c2d2e046da0976782ece25e78dc8b (patch) | |
| tree | 6b3b8309595e49173d935ed95e71fcc2788d4e24 /include/net | |
| parent | pkt_sched: pedit use proper struct (diff) | |
| download | linux-dev-5fdb9973c10c2d2e046da0976782ece25e78dc8b.tar.xz linux-dev-5fdb9973c10c2d2e046da0976782ece25e78dc8b.zip | |
net: Fix struct sock bitfield annotation
Since commit a98b65a3 (net: annotate struct sock bitfield), we lost
8 bytes in struct sock on 64bit arches because of
kmemcheck_bitfield_end(flags) misplacement.
Fix this by putting together sk_shutdown, sk_no_check, sk_userlocks,
sk_protocol and sk_type in the 'flags' 32bits bitfield
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/sock.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 1621935aad5b..9f96394f694e 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -226,12 +226,12 @@ struct sock { #define sk_prot __sk_common.skc_prot #define sk_net __sk_common.skc_net kmemcheck_bitfield_begin(flags); - unsigned char sk_shutdown : 2, - sk_no_check : 2, - sk_userlocks : 4; + unsigned int sk_shutdown : 2, + sk_no_check : 2, + sk_userlocks : 4, + sk_protocol : 8, + sk_type : 16; kmemcheck_bitfield_end(flags); - unsigned char sk_protocol; - unsigned short sk_type; int sk_rcvbuf; socket_lock_t sk_lock; /* |