Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966501AbcCPINO (ORCPT ); Wed, 16 Mar 2016 04:13:14 -0400 Received: from mail.kernel.org ([198.145.29.136]:60774 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966031AbcCPINH (ORCPT ); Wed, 16 Mar 2016 04:13:07 -0400 From: lizf@kernel.org To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Hannes Frederic Sowa , "David S. Miller" , Zefan Li Subject: [PATCH 3.4 099/107] net: fix warnings in 'make htmldocs' by moving macro definition out of field declaration Date: Wed, 16 Mar 2016 16:06:33 +0800 Message-Id: <1458115601-5762-99-git-send-email-lizf@kernel.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1458115541-5712-1-git-send-email-lizf@kernel.org> References: <1458115541-5712-1-git-send-email-lizf@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1176 Lines: 38 From: Hannes Frederic Sowa 3.4.111-rc1 review patch. If anyone has any objections, please let me know. ------------------ 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 [lizf: Backported to 3.4: adjust context] Signed-off-by: Zefan Li --- 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 e2073e0..ddc3737 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -328,8 +328,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_wmem_queued; gfp_t sk_allocation; -- 1.9.1