From patchwork Fri Jul 26 02:10:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11060153 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A3D1F138D for ; Fri, 26 Jul 2019 02:23:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A31A28A32 for ; Fri, 26 Jul 2019 02:23:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7D58128A68; Fri, 26 Jul 2019 02:23:17 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 0E333289EB for ; Fri, 26 Jul 2019 02:23:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725842AbfGZCXQ (ORCPT ); Thu, 25 Jul 2019 22:23:16 -0400 Received: from condef-04.nifty.com ([202.248.20.69]:56001 "EHLO condef-04.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725808AbfGZCXQ (ORCPT ); Thu, 25 Jul 2019 22:23:16 -0400 X-Greylist: delayed 512 seconds by postgrey-1.27 at vger.kernel.org; Thu, 25 Jul 2019 22:23:15 EDT Received: from conuserg-10.nifty.com ([10.126.8.73])by condef-04.nifty.com with ESMTP id x6Q2Bfev016282; Fri, 26 Jul 2019 11:11:41 +0900 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id x6Q2B03n020523; Fri, 26 Jul 2019 11:11:05 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com x6Q2B03n020523 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1564107066; bh=tnYEZud056hAhoewZO62tSceN4oWh0Eu5vKNqgUHTuA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eAQTARqBJdu5M8oLYd9bZGW5wUIXU99lD2ThtL6eLuFOMuxsHICMGHymnGXmleVYg Qa74aWIuWW6Sy5XLCpWzGV3rzgw2M5BplNz2l7owILS32xrbkw713nPjK+MobFaugG Ppf0wkHQYTPKDkYTF9hsbNZIMxzYT2gVQmhkQzEttDwwpKbogmjgpS0xxjjrTwAGiD aB5qreWN5KaHdUPdDN/C1Cnmv/FO/LW4b/1Gr359v3j5x2ycE4oH+Dy0sMBBUQt69K wk+ZYdETNjLFXjjtyaKw7R6nh6tHDhf/Ms3iRL4cvNbtrEeoI5A4XcFPKj7u0AEh2v GFccDlB1DNNnA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Mimi Zohar , linux-integrity@vger.kernel.org Cc: Masahiro Yamada , James Morris , "Serge E. Hallyn" , linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org Subject: [PATCH 5/5] EVM: use obj-y for non-modular objects Date: Fri, 26 Jul 2019 11:10:58 +0900 Message-Id: <20190726021058.4212-6-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-integrity-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP CONFIG_EVM 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_EVM=y since this directory is guarded by the parent Makefile: obj-$(CONFIG_EVM) += evm/ So, there is no point in creating the composite object, evm.o Flatten the code into the obj-$(CONFIG_...) form. Signed-off-by: Masahiro Yamada --- security/integrity/evm/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/security/integrity/evm/Makefile b/security/integrity/evm/Makefile index a56f5613be79..ace8e4ef5a96 100644 --- a/security/integrity/evm/Makefile +++ b/security/integrity/evm/Makefile @@ -2,7 +2,5 @@ # # Makefile for building the Extended Verification Module(EVM) # -obj-$(CONFIG_EVM) += evm.o - -evm-y := evm_main.o evm_crypto.o evm_secfs.o -evm-$(CONFIG_FS_POSIX_ACL) += evm_posix_acl.o +obj-y := evm_main.o evm_crypto.o evm_secfs.o +obj-$(CONFIG_FS_POSIX_ACL) += evm_posix_acl.o