net: Fix struct sock bitfield annotation
authorEric Dumazet <eric.dumazet@gmail.com>
Thu, 8 Oct 2009 22:50:25 +0000 (22:50 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 12 Oct 2009 06:03:52 +0000 (23:03 -0700)
commit5fdb9973c10c2d2e046da0976782ece25e78dc8b
tree6b3b8309595e49173d935ed95e71fcc2788d4e24
parent53f7e35f8b7fc2f5620a863ac613bcf3080cb6ba
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>
include/net/sock.h