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>
This commit is contained in:
parent
53f7e35f8b
commit
5fdb9973c1
|
@ -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;
|
||||
/*
|
||||
|
|
Loading…
Reference in a new issue