From patchwork Fri Jul 26 02:10:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 169771 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp12370497ilk; Thu, 25 Jul 2019 19:11:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqyZOB5f8SSQlChLy7bKisGlW+qB2eTNn24PhkxhdRwpcyZ2jDV3W8MJpHp+8rTdnDn14bJ1 X-Received: by 2002:a62:754d:: with SMTP id q74mr19121479pfc.211.1564107107288; Thu, 25 Jul 2019 19:11:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564107107; cv=none; d=google.com; s=arc-20160816; b=jTgwClUa5x6+jbT6Vd3rZiVJe6FkTQk+p+G2qzkdgXEDnxqlOgSxTDG/vxnVj10x6u HGglvDMEpfNdoZPHM8l8ZyqTvS6jhdzIDiSPLzzwy2EJt8RTdAqAnlRvi2tX4fmshsce PBoe4eiVe0vhxm+dl/3VeyfRJfE/D5K6M5VwgDhs4D0pZnuB8kf6JmPqkjAYhB5XPC+m YDIjM1Lh4fiemZUVLHo85TigGzAjbk4v17e/iKXY4dAblVIzwhDUnDW8gYp3+vAS10aJ UXDyTuPtDKiAZqyAaP/j4P9KpTku8M1eaq7wcRVu2ZjvOzHGnds7UkJrX3tyHQXI66mQ 2RJg== 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; bh=2py97rXQmeBJv0x49nST5dYu797IUCM7mWTUZUS20lY=; b=Z97pBaacR24O73wiwgRZodYP1u83Bj/738eYuABUUO02Jtz5YM1FsnQU2Urh0ZPF8g OJW8uD33qEh3lSBm34EpR9aRiYkCCe14OjvKXCqnXhNeMBIVu8QyveK/iSqAITX355QG egojpDiI24lYXXrXAGzPxzWCO0Cdvk6jVTRMpH2Df/76O6GbDBhopReaS4nNEKNt3T90 HLGp7k06jXJUQZbVdxD/qqZ91v41+sKrEVahvSPqRXnOmDHmBNbJwVVu9w+Q9jnJB+1C cNXE9jncs3LypZMVgEdlyoq8AH6YL5hdBNrAp742Zs5Cx8F8GoW7+imL5fOA6+baRMmH DYpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=MXTzbm4u; 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 e13si20681578pfl.279.2019.07.25.19.11.46; Thu, 25 Jul 2019 19:11:47 -0700 (PDT) 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=MXTzbm4u; 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 S1726148AbfGZCLp (ORCPT + 29 others); Thu, 25 Jul 2019 22:11:45 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:63653 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725819AbfGZCLo (ORCPT ); Thu, 25 Jul 2019 22:11:44 -0400 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id x6Q2B03m020523; Fri, 26 Jul 2019 11:11:04 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com x6Q2B03m020523 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1564107065; bh=2py97rXQmeBJv0x49nST5dYu797IUCM7mWTUZUS20lY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MXTzbm4uOdkuSdZBWHV2rF+A3QgFM7x2x+mWb3z+COmAhltTh4e67vwYhx6iyiTA6 /FEanUpRLEBSYNwyQGaPJ3+cA1R/J8VyXHEmA63HfXDQjgjPS1qURaoACzCHNwuJ3n Q0yRW6ff5zMqvLj+AHdWPTvEyy7gd4h8flSJFV6DyNwwd/viWiL8IEK3Wh5WOBeZ6U Ic/pQxZYWBYTgLB614/VwvRA4VBheSEBj7bFlOkYBP7ZhbEhLf9OC53M5gSKpYelUL /B4C9AdZydWf5TCmq0GKUS+lcVOL4pfVfMVBR9l98AJ2T0oowPWqOfVNzx0+Gwpu4K Emm/8uq34ANBQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Mimi Zohar , linux-integrity@vger.kernel.org Cc: Masahiro Yamada , Dmitry Kasatkin , James Morris , "Serge E. Hallyn" , linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org Subject: [PATCH 4/5] IMA: use obj-y for non-modular objects Date: Fri, 26 Jul 2019 11:10:57 +0900 Message-Id: <20190726021058.4212-5-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190726021058.4212-1-yamada.masahiro@socionext.com> References: <20190726021058.4212-1-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org CONFIG_IMA is a boolean option, so none of these objects is linked into a module. All the objects in this directory are compiled only when CONFIG_IMA=y since this directory is guarded by the parent Makefile: obj-$(CONFIG_IMA) += ima/ So, there is no point in creating the composite object, ima.o Flatten the code into the obj-$(CONFIG_...) form. Signed-off-by: Masahiro Yamada --- security/integrity/ima/Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) -- 2.17.1 diff --git a/security/integrity/ima/Makefile b/security/integrity/ima/Makefile index d921dc4f9eb0..5517486c9154 100644 --- a/security/integrity/ima/Makefile +++ b/security/integrity/ima/Makefile @@ -4,10 +4,8 @@ # Measurement Architecture(IMA). # -obj-$(CONFIG_IMA) += ima.o - -ima-y := ima_fs.o ima_queue.o ima_init.o ima_main.o ima_crypto.o ima_api.o \ +obj-y := ima_fs.o ima_queue.o ima_init.o ima_main.o ima_crypto.o ima_api.o \ ima_policy.o ima_template.o ima_template_lib.o -ima-$(CONFIG_IMA_APPRAISE) += ima_appraise.o -ima-$(CONFIG_HAVE_IMA_KEXEC) += ima_kexec.o +obj-$(CONFIG_IMA_APPRAISE) += ima_appraise.o +obj-$(CONFIG_HAVE_IMA_KEXEC) += ima_kexec.o obj-$(CONFIG_IMA_BLACKLIST_KEYRING) += ima_mok.o