From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-Id: <20160123141222.451070860@1wt.eu> Date: Sat, 23 Jan 2016 15:12:32 +0100 From: Willy Tarreau To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: kbuild test robot , Hannes Frederic Sowa , "David S. Miller" , Ben Hutchings , Willy Tarreau Subject: [PATCH 2.6.32 11/42] net: fix warnings in make htmldocs by moving macro definition out of field declaration MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org List-ID: 2.6.32-longterm review patch. If anyone has any objections, please let me know. ------------------ From: Hannes Frederic Sowa commit 7bbadd2d1009575dad675afc16650ebb5aa10612 upstream. Docbook does not like the definition of macros inside a field declaration and adds a warning. Move the definition out. Fixes: 79462ad02e86180 ("net: add validation for the socket syscall protocol argument") Reported-by: kbuild test robot Signed-off-by: Hannes Frederic Sowa Signed-off-by: David S. Miller [bwh: Backported to 3.2: keep open-coding U8_MAX] Signed-off-by: Ben Hutchings (cherry picked from commit 35da6d62b608fd3beb576d72e48e2bc866d714c9) [wt: adjusted context] Signed-off-by: Willy Tarreau --- include/net/sock.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/net/sock.h b/include/net/sock.h index 0de7d22..44d6be8 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -230,8 +230,8 @@ struct sock { sk_no_check : 2, sk_userlocks : 4, sk_protocol : 8, -#define SK_PROTOCOL_MAX ((u8)~0U) sk_type : 16; +#define SK_PROTOCOL_MAX ((u8)~0U) kmemcheck_bitfield_end(flags); int sk_rcvbuf; socket_lock_t sk_lock; -- 1.7.12.2.21.g234cd45.dirty