From patchwork Fri Jan 5 03:10:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 123471 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp295209qgn; Thu, 4 Jan 2018 19:11:34 -0800 (PST) X-Google-Smtp-Source: ACJfBouwO8xeD21QRcy/bW1no/zjkneb4m3ZvUlNPT7S7lTLBKGOK2XmuYMb5OYX9VdYPcTE+Ntf X-Received: by 10.99.161.1 with SMTP id b1mr1310522pgf.94.1515121894067; Thu, 04 Jan 2018 19:11:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515121894; cv=none; d=google.com; s=arc-20160816; b=g/NwPVf87Zr3M02b6HcxMhbZuKW2bGk40nMnR4fNZsxUe9C/OELMw7Iq5ClA+mdHPX pw7350/tRVND+z9uRrpgm4Qc2RAaewP2PI3rx+j2RUemIUoXbiSZgmgdbjs6ndK/4I57 s97XePhyK+tLQB5dGYW4Vm/+gDnlVSXL902YwIFGj8ORb06qju52Mwxo/9YfNdqiF60H V1ZSkzCbvA6gRMyOU1pgtzpn4I72Xv9Xo2vQzjcwWF9Y1wBHBF1d44QftCKfhC+/KOls qZCR3rWqaJY9q/ThH/YSo9gO0z+K/3eXDgkroBQ1TTWzrZtOH6erNbW5M5F3Qw2RFXMK Oizw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=lZT0EAmarsvI3dEVEJkxuW0gdj5+j5dF9y2XYaYp7ys=; b=qgCuITts9MqgN/Mo/FgDuqlXOW3054XQqlQzafS0eh84UE58NeEk6JXU6aTuuDqwRw Fbr4t/QQVjdNS2YF1A1Zhbptf5T1kTymKdM9Ojf7c+txOrHMjhmbxVTkeTGcfXsfR6L8 6BHCB0oj/2ODyMF1ycgqWwHllkfxmX0eSZnEXelbbetHujQPic80UvSqtxJyPAm3WgZW qKnwmfUCjIa7aFBilAL7zBViygXTOYucVJMm85bCcop50g0wjilCxU0+S2MqtPBQo27E +5cyuHfU54sWiv73/BzT9P7hUCDGMo+t7EI1n0Ugd4v443NARf2LAgpqJGc34OoEwRxV 6hng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=Sl7Z15KS; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b5si3285330ple.716.2018.01.04.19.11.33; Thu, 04 Jan 2018 19:11:34 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=Sl7Z15KS; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751442AbeAEDL3 (ORCPT + 21 others); Thu, 4 Jan 2018 22:11:29 -0500 Received: from conuserg-10.nifty.com ([210.131.2.77]:32372 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751240AbeAEDL2 (ORCPT ); Thu, 4 Jan 2018 22:11:28 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id w053B8w9007744; Fri, 5 Jan 2018 12:11:09 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com w053B8w9007744 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1515121869; bh=lZT0EAmarsvI3dEVEJkxuW0gdj5+j5dF9y2XYaYp7ys=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Sl7Z15KSXU1sROhGK2/8M8HIKWA6RmfK2wNLszH/UTIOcv9eEEmvNXzFrl8nyK7Rm 9mqJlJbYiI+N7DE3Oj3GJ/NJqjpKCXTrzZ6YcmolsDIqXRJFT70azIH80EfkApWukv 1JQdpkTt8FMDfyK9e11xW1hZnIYHhkjg8lVJ5Av3zSdbHpYrIrW3h48yDv7A24vpk1 Gpj0tQFgdjHG+oQRsu5htkLIVQ+MJtLzBBI1TQI9/8j4F4zgFNKuJFgOg5aPrlVqxp 2h0QEJ27MqBbQyAVuE0HGNB3WuD9KgKihB7fX5JnMNVOpyF6j7BEQHg2kK96fHH7yQ weEj5Dkm7re9Q== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Andrew Morton Cc: Ian Abbott , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 1/2] genl_magic: remove own BUILD_BUG_ON*() defines Date: Fri, 5 Jan 2018 12:10:32 +0900 Message-Id: <1515121833-3174-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515121833-3174-1-git-send-email-yamada.masahiro@socionext.com> References: <1515121833-3174-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Do not duplicate BUILD_BUG_ON*. Use ones from . Signed-off-by: Masahiro Yamada --- include/linux/genl_magic_func.h | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) -- 2.7.4 diff --git a/include/linux/genl_magic_func.h b/include/linux/genl_magic_func.h index 6049676..83f81ac 100644 --- a/include/linux/genl_magic_func.h +++ b/include/linux/genl_magic_func.h @@ -2,6 +2,7 @@ #ifndef GENL_MAGIC_FUNC_H #define GENL_MAGIC_FUNC_H +#include #include /* @@ -132,17 +133,6 @@ static void dprint_array(const char *dir, int nla_type, * use one static buffer for parsing of nested attributes */ static struct nlattr *nested_attr_tb[128]; -#ifndef BUILD_BUG_ON -/* Force a compilation error if condition is true */ -#define BUILD_BUG_ON(condition) ((void)BUILD_BUG_ON_ZERO(condition)) -/* Force a compilation error if condition is true, but also produce a - result (of value 0 and type size_t), so the expression can be used - e.g. in a structure initializer (or where-ever else comma expressions - aren't permitted). */ -#define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); })) -#define BUILD_BUG_ON_NULL(e) ((void *)sizeof(struct { int:-!!(e); })) -#endif - #undef GENL_struct #define GENL_struct(tag_name, tag_number, s_name, s_fields) \ /* *_from_attrs functions are static, but potentially unused */ \ From patchwork Fri Jan 5 03:10:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 123473 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp295838qgn; Thu, 4 Jan 2018 19:12:27 -0800 (PST) X-Google-Smtp-Source: ACJfBouMTayVe6pK0nZGEc1q1E+IDwK12axj0FBeZfitrejq5WBQ+IUXhaIcxRbSXaDTYmLp6+Ma X-Received: by 10.99.176.7 with SMTP id h7mr1313499pgf.50.1515121947826; Thu, 04 Jan 2018 19:12:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515121947; cv=none; d=google.com; s=arc-20160816; b=iXX05sIihubyW1/9WNPZfBhxfsIoJekFojP3741bYu47Meq5rAOyWyxo8UkMB6yZvG Nxwl8BE7Pa/QuotsUtjffNLH/XYdn0tohOxGwrdWlHtZJ6+2PuCEktXhiUFNszRkiG89 77w7HjrRcCSLClss4HnNg3GhTcvEfGKuQ1dIR1oqHxy/uP5x3QF03vP+GM2cOSl6JONM 9qcoBBxdXKt37io3sjCuRUlyuJL0rABCbh0gFjYWP2XQ3+vtee9dNL/lj8gsQre51QIO uiY2G4Y4E3g4Dw6tFt5LIs9Ex+Y5N9Xxw+zJ2GzXyl5F0d0klNNd0hZNxjZgACXdjmrA ZqDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=jLfUO4nKJSi7wTDgNzlZMy9qEpvb6ONeHDerJNpEP+E=; b=CHkyju4TArQGpIzJHGjnbsZL1LeZwxx2aNZYoFWa7B9dRui0xUsqb7W9OmAGZMhhdk 3K5seM5gV0POdL1PpL3IFqtfzJeW0IDYoF5SpESKMfqoUh/8nyfCUKYilcY4HtNChzdg jSCjXVMeSL0JhhJMYYtIKA0xmeUdDFXhXlfUoj3Pi2QgeryfXggbC3DtHiZxJI682laU dTAlYSacLJBD+Lj7/C6KJNe/NDLZOhkt7l1fUMbj5okvTh2spuv52VJp3R8MAIeXEjTt 42S9BWKzuw9FE+pvYS2rKmT6NfmLohMzjc0dbCwfMfMm11gXQaKZAPVDAdcy9EdxtP/d cQNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=auWXuat1; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l75si2930659pga.729.2018.01.04.19.12.27; Thu, 04 Jan 2018 19:12:27 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=auWXuat1; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751504AbeAEDMN (ORCPT + 21 others); Thu, 4 Jan 2018 22:12:13 -0500 Received: from conuserg-10.nifty.com ([210.131.2.77]:33765 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751240AbeAEDMM (ORCPT ); Thu, 4 Jan 2018 22:12:12 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id w053B8wA007744; Fri, 5 Jan 2018 12:11:10 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com w053B8wA007744 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1515121870; bh=jLfUO4nKJSi7wTDgNzlZMy9qEpvb6ONeHDerJNpEP+E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=auWXuat1+t/YhdX6G7m+3V2SdmoqfpVmHq8H6B9PE/B0rqNFc5Y/s+31INWnAz2H2 I74Fp3RpcjRpBxosRLMx2VOP+dw1DuJT0k5Aay/Od/TJCXTAaXHIRguDLhQ4IoWD12 wi2OO55R3uTapW6mCDJZuLelAx7bCGv4O55YJ9A1PVG/LkBhNEK8s4Wfzzdkp/tuoZ fG+JOeC8mMx6oPF1EUenzkIo/7dLc/HonooMB4JV86OKXZSVqF057XNegMQZKyv1Hc 5x2bv4Xvp3b7gEUNdkB2rnStARJokdXPhZcOXLLSdTBDU9N48EZWaMFrs/3DgAi/1q kcg6m1xL1ugew== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Andrew Morton Cc: Ian Abbott , Masahiro Yamada , Hideaki YOSHIFUJI , netdev@vger.kernel.org, Alexey Kuznetsov , linux-kernel@vger.kernel.org, "David S. Miller" Subject: [PATCH 2/2] build_bug.h: remove BUILD_BUG_ON_NULL() Date: Fri, 5 Jan 2018 12:10:33 +0900 Message-Id: <1515121833-3174-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515121833-3174-1-git-send-email-yamada.masahiro@socionext.com> References: <1515121833-3174-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This macro is only used by net/ipv6/mcast.c, but there is no reason why it must be BUILD_BUG_ON_NULL(). Replace it with BUILD_BUG_ON_ZERO(), and remove BUILD_BUG_ON_NULL() definition from . Signed-off-by: Masahiro Yamada --- include/linux/build_bug.h | 2 -- net/ipv6/mcast.c | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) -- 2.7.4 diff --git a/include/linux/build_bug.h b/include/linux/build_bug.h index 3efed0d..43d1fd5 100644 --- a/include/linux/build_bug.h +++ b/include/linux/build_bug.h @@ -8,7 +8,6 @@ #define __BUILD_BUG_ON_NOT_POWER_OF_2(n) (0) #define BUILD_BUG_ON_NOT_POWER_OF_2(n) (0) #define BUILD_BUG_ON_ZERO(e) (0) -#define BUILD_BUG_ON_NULL(e) ((void *)0) #define BUILD_BUG_ON_INVALID(e) (0) #define BUILD_BUG_ON_MSG(cond, msg) (0) #define BUILD_BUG_ON(condition) (0) @@ -28,7 +27,6 @@ * aren't permitted). */ #define BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:(-!!(e)); })) -#define BUILD_BUG_ON_NULL(e) ((void *)sizeof(struct { int:(-!!(e)); })) /* * BUILD_BUG_ON_INVALID() permits the compiler to check the validity of the diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c index 8446426..b28d4aa 100644 --- a/net/ipv6/mcast.c +++ b/net/ipv6/mcast.c @@ -65,10 +65,10 @@ #include /* Ensure that we have struct in6_addr aligned on 32bit word. */ -static void *__mld2_query_bugs[] __attribute__((__unused__)) = { - BUILD_BUG_ON_NULL(offsetof(struct mld2_query, mld2q_srcs) % 4), - BUILD_BUG_ON_NULL(offsetof(struct mld2_report, mld2r_grec) % 4), - BUILD_BUG_ON_NULL(offsetof(struct mld2_grec, grec_mca) % 4) +static int __mld2_query_bugs[] __attribute__((__unused__)) = { + BUILD_BUG_ON_ZERO(offsetof(struct mld2_query, mld2q_srcs) % 4), + BUILD_BUG_ON_ZERO(offsetof(struct mld2_report, mld2r_grec) % 4), + BUILD_BUG_ON_ZERO(offsetof(struct mld2_grec, grec_mca) % 4) }; static struct in6_addr mld2_all_mcr = MLD2_ALL_MCR_INIT;