From patchwork Thu Mar 1 15:24:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130249 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp2941336edc; Thu, 1 Mar 2018 07:30:16 -0800 (PST) X-Google-Smtp-Source: AG47ELuN4YkssofeCD0/OBlTPevXdRouvRlOpcmDqpmlV9636fe7Ldu6ex6Y9+XRKjtWV+WHsOXo X-Received: by 2002:a17:902:7d17:: with SMTP id z23-v6mr2233085pll.427.1519918216315; Thu, 01 Mar 2018 07:30:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519918216; cv=none; d=google.com; s=arc-20160816; b=dSXYdFsSwdG9KcYaTWrd/bxWMNRAGO9uDKqTIUGiGXzzTeEahbEnjqY2P6Ljga13d+ pGRNkBXgLrjioQ9y0BdOkZ10qR28JPAGTE9H+nLJ2RXipwhYbLpOfbQFIcU34EYYPDkE BPXXDCkH1ieQL4OPGo1IHwWTsZ9wkgnWw/DQnTmSwDOMbUh/KolZ81Yj6utEH05uClkG Tol9w5IQHrlFgqJ3LeFHYXP0kUltKws7rI8jGK0iW7PUKEbo+kHUe6oUn4jz5Tt42uHl CqZz2kJ0heHG3yc9cSvFtAhjQdbgUBTngujGyetIJjAU9sh2TB4kq7R87RQ/9VLIAdUd f9TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=r/aBuG4DzTQsxP6atJki6RvytC1XV4FpQEycQr8WnQE=; b=Tl7n04L5IvR3Gb77P7tjv+3SFLlUt4ipf/q8HqLIf5p7ENVZWx2QArLorIVWPiGDwd W5czhN7f7Gr8Vr7cqNTAj4JRvcbqcKsQO3v0r3OCsckfHsT/drg9NvXduK+u+HfU1RYw Yyb2fSf9pItNZJIbzRsjCdXIn8d4jlnCZHFlmVWmODyo3oh46CJ82m5y1tnQgahMMkaC sco6PO5k9rsnewOhl/Y+qKSHuEF7bGKjVgv3EvkBBR8HqMTZ7IwndskMr9Zw9pQy4lv+ LeIe7fTxikfYxWIUyNrC9GxZIHnJUrEho7JP8xVy4VjMuQwZj+33gJPw9Xy4UZEHJ7hb cWUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=RsUT9Y2p; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z7si2597209pgp.660.2018.03.01.07.30.16; Thu, 01 Mar 2018 07:30:16 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-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=@microsoft.com header.s=selector1 header.b=RsUT9Y2p; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1032177AbeCAPaO (ORCPT + 10 others); Thu, 1 Mar 2018 10:30:14 -0500 Received: from mail-dm3nam03on0126.outbound.protection.outlook.com ([104.47.41.126]:51562 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1032162AbeCAP3v (ORCPT ); Thu, 1 Mar 2018 10:29:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=r/aBuG4DzTQsxP6atJki6RvytC1XV4FpQEycQr8WnQE=; b=RsUT9Y2pRki8CefI7IiiwfamDHxn/DD94GPHTW9/e+6w8CgEyCMg/YGvhQQpnBHoo+OSU/vtzTKXUTQMrUK8osTKwZogeP7Oyu7bAf8X/F2PHLfbhLlwo/ydZmlPzXKa4rZYODUw2qyjAndXqpTdU84hB7G1FrXoqvS+b0DErEw= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0984.namprd21.prod.outlook.com (52.132.133.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.567.2; Thu, 1 Mar 2018 15:29:42 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446%2]) with mapi id 15.20.0567.006; Thu, 1 Mar 2018 15:29:42 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Masahiro Yamada , Michal Marek , Sasha Levin Subject: [added to the 4.1 stable tree] kconfig.h: use __is_defined() to check if MODULE is defined Thread-Topic: [added to the 4.1 stable tree] kconfig.h: use __is_defined() to check if MODULE is defined Thread-Index: AQHTsXFd5jX9s/Svz0iZdf4NZXa0cw== Date: Thu, 1 Mar 2018 15:24:18 +0000 Message-ID: <20180301152116.1486-178-alexander.levin@microsoft.com> References: <20180301152116.1486-1-alexander.levin@microsoft.com> In-Reply-To: <20180301152116.1486-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB0984; 7:bnpcO8XCdVmkrUEFWLvo/j/uS8/dx6sq8kyxPg14Wp0gy6XakmKZBIrI5+a5o5G2uwhHtrbedkIdfWcMzX0T3G0jkGVgRAQStMQOMG7OVlIQ8CqVw8yAePTWQoUPili/9pAqpE7/OzpQ9BbnHtkDs0X6j39P3Cp62oWzAp5miG+TJbcp5hGzCgV4Jxi28q0i70R9kZyxzrz/fTYJbFnV6/uUo1TtJMAuU0kzv1VdS+DpqPdkrYvp9sWRIsGih/yj x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 4b08e17d-e5b1-497f-030e-08d57f894138 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020); SRVR:DM5PR2101MB0984; x-ms-traffictypediagnostic: DM5PR2101MB0984: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040501)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(10201501046)(3231220)(944501228)(52105095)(6055026)(61426038)(61427038)(6041288)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:DM5PR2101MB0984; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB0984; x-forefront-prvs: 05986C03E0 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39860400002)(366004)(39380400002)(376002)(396003)(346002)(189003)(199004)(68736007)(14454004)(6346003)(6116002)(26005)(1076002)(99286004)(4326008)(305945005)(186003)(86612001)(10290500003)(2906002)(97736004)(86362001)(107886003)(6666003)(66066001)(105586002)(3846002)(2900100001)(3660700001)(3280700002)(316002)(5660300001)(8676002)(8936002)(81166006)(81156014)(22452003)(36756003)(54906003)(10090500001)(76176011)(25786009)(6512007)(6486002)(110136005)(7736002)(478600001)(72206003)(106356001)(6506007)(2950100002)(2501003)(53936002)(5250100002)(6436002)(102836004)(22906009); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0984; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: EWpIQJWeIsvcMbwUB61RHufsIzr5krFsGTpiDTutGl7wi7eteyQXCO4c96Z0twrHfKpsRALbopWEebomrTn+v6wC6NJIjl4p1pCpwFh40Xev1YuzJ4NU2vLTHuLNaXbdl5VZUl6LVyZzZ43g3WGjb4am3FtFqlf02OWUOeXzj9U= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4b08e17d-e5b1-497f-030e-08d57f894138 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2018 15:24:18.6507 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0984 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Masahiro Yamada This patch has been added to the 4.1 stable tree. If you have any objections, please let us know. -- 2.14.1 =============== [ Upstream commit 4f920843d248946545415c1bf6120942048708ed ] The macro MODULE is not a config option, it is a per-file build option. So, config_enabled(MODULE) is not sensible. (There is another case in include/linux/export.h, where config_enabled() is used against a non-config option.) This commit renames some macros in include/linux/kconfig.h for the use for non-config macros and replaces config_enabled(MODULE) with __is_defined(MODULE). I am keeping config_enabled() because it is still referenced from some places, but I expect it would be deprecated in the future. Signed-off-by: Masahiro Yamada Signed-off-by: Michal Marek Signed-off-by: Sasha Levin --- include/linux/kconfig.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/include/linux/kconfig.h b/include/linux/kconfig.h index b33c7797eb57..a94b5bf57f51 100644 --- a/include/linux/kconfig.h +++ b/include/linux/kconfig.h @@ -17,10 +17,11 @@ * the last step cherry picks the 2nd arg, we get a zero. */ #define __ARG_PLACEHOLDER_1 0, -#define config_enabled(cfg) _config_enabled(cfg) -#define _config_enabled(value) __config_enabled(__ARG_PLACEHOLDER_##value) -#define __config_enabled(arg1_or_junk) ___config_enabled(arg1_or_junk 1, 0) -#define ___config_enabled(__ignored, val, ...) val +#define config_enabled(cfg) ___is_defined(cfg) +#define __is_defined(x) ___is_defined(x) +#define ___is_defined(val) ____is_defined(__ARG_PLACEHOLDER_##val) +#define ____is_defined(arg1_or_junk) __take_second_arg(arg1_or_junk 1, 0) +#define __take_second_arg(__ignored, val, ...) val /* * IS_BUILTIN(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'y', 0 @@ -42,7 +43,7 @@ * built-in code when CONFIG_FOO is set to 'm'. */ #define IS_REACHABLE(option) (config_enabled(option) || \ - (config_enabled(option##_MODULE) && config_enabled(MODULE))) + (config_enabled(option##_MODULE) && __is_defined(MODULE))) /* * IS_ENABLED(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'y' or 'm',