From patchwork Tue Feb 7 11:15:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arend van Spriel X-Patchwork-Id: 9559695 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A13946047A for ; Tue, 7 Feb 2017 11:15:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 91A8C283CA for ; Tue, 7 Feb 2017 11:15:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 852A4283EE; Tue, 7 Feb 2017 11:15:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC30C283CA for ; Tue, 7 Feb 2017 11:15:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753285AbdBGLPk (ORCPT ); Tue, 7 Feb 2017 06:15:40 -0500 Received: from lpdvrndsmtp01.broadcom.com ([192.19.229.170]:38450 "EHLO rnd-relay.smtp.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753230AbdBGLPj (ORCPT ); Tue, 7 Feb 2017 06:15:39 -0500 Received: from mail-irv-17.broadcom.com (mail-irv-17.lvn.broadcom.net [10.75.224.233]) by rnd-relay.smtp.broadcom.com (Postfix) with ESMTP id E980730C13F; Tue, 7 Feb 2017 03:15:36 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.10.3 rnd-relay.smtp.broadcom.com E980730C13F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1486466137; bh=JwEORvwxp6KuMb9NLInD51XJ/HyJy/TwXtgO71Se1jg=; h=From:To:Cc:Subject:Date:From; b=OOYVh8PANRdbiGFv6ahzvVG6rYZrcUgBTTSvcuJ1GaQS+IuIPXtfB0+CWGz0LxJMb B8cYBy96AEcfCvgYreh5/hASWr/ykhnJraLd1A7R9V832vWgsP+gdvRp/YWQmRdgCE CLQnhS/ffjeHRmACuDf8o4nopGYeHFy9ropS0u68= Received: from jenkins-cam-14.cam.broadcom.com (jenkins-cam-14.cam.broadcom.com [10.177.128.77]) by mail-irv-17.broadcom.com (Postfix) with ESMTP id A55AE81F52; Tue, 7 Feb 2017 03:15:36 -0800 (PST) Received: by jenkins-cam-14.cam.broadcom.com (Postfix, from userid 25152) id F3AA2B84DFD; Tue, 7 Feb 2017 11:15:35 +0000 (GMT) From: Arend van Spriel To: "Luis R. Rodriguez" Cc: backports@vger.kernel.org, Arend van Spriel Subject: [PATCH] backports: restore config_enabled() macro Date: Tue, 7 Feb 2017 11:15:24 +0000 Message-Id: <1486466124-31640-1-git-send-email-arend.vanspriel@broadcom.com> X-Mailer: git-send-email 1.9.1 Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Attempted a backport to FC25 4.9.5 kernel and hit issue with IS_BUILTIN() using config_enabled() macro in backport-include/linux/kconfig.h. Fix this by using #ifndef. Signed-off-by: Arend van Spriel --- backport/backport-include/linux/kconfig.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/backport/backport-include/linux/kconfig.h b/backport/backport-include/linux/kconfig.h index 4fe2a10..e284dca 100644 --- a/backport/backport-include/linux/kconfig.h +++ b/backport/backport-include/linux/kconfig.h @@ -21,6 +21,13 @@ (config_enabled(option) || config_enabled(option##_MODULE)) #endif +/* + * Since 4.9 config_enabled has been removed in favor of __is_defined. + */ +#ifndef config_enabled +#define config_enabled(cfg) __is_defined(cfg) +#endif + #undef IS_BUILTIN #define IS_BUILTIN(option) config_enabled(option)