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: 169770 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp12370448ilk; Thu, 25 Jul 2019 19:11:43 -0700 (PDT) X-Google-Smtp-Source: APXvYqx2g0m1jz+5ln8Q+ZXUce7oXlzYUCmj9wHk8q9I+TYRMLO/dFhIR9NkaCdxbJ3fbu6Zm8Ck X-Received: by 2002:a17:902:f213:: with SMTP id gn19mr96472358plb.35.1564107103373; Thu, 25 Jul 2019 19:11:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564107103; cv=none; d=google.com; s=arc-20160816; b=pJhutAV+xDdirn7slq5oueeVTG64OISzhN6G5QqcxNqPNQViYsFnOBIo65ifkQki43 yn7FO1LzyNbO9PQjSvmvPh3sTDR9BavsihILHaZk7rfjOo4brhnLTiV7/oi3vOZ9QWI0 HdUB9zQCbT6wUcZfZwUMzTm1byeqaEmbnJ6YV6+fOiLcyTmnxZmcPt3iRql2cc+3C3M2 7AYk1Tb7aP2p9QcfrWR2toDX0t2pbEUwEyLQR/vl4env+roY4pLUKCugZ+Gq0oQFHt+7 uMOhc0IZyt7GSOziMZLxuZas7X3KT+Lw5SVZhDieFaTPQVu9cVBjiW2LcKC5kKLPgm2O aLpw== 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=tnYEZud056hAhoewZO62tSceN4oWh0Eu5vKNqgUHTuA=; b=hkiXrqSb3a8dksXlxrD3y4yxrM8AadGlGlVOieGdNEvQRmx/togFSaSSRx/PKIKk1N L53ibqt7wTHDjwsl/Zqvn5s2CRRkCZGg8uu/EDVPhtJSh8M+z1gh5YdZ2rMqrqeNsFpS qPQU3biMLc4q4wN+3Ft+GaTG9MH0tncqB0TnB1w4MNNhaohQbxXp3NZ3fiUS92SVNEyD gDmw7OOqtWw3tS2YKSbaGD/2RWc0VCZMcM0e4pWCLGJ0nTOahkyhycihTWyPDkJfm8f1 +mc4G7vgIzY3kodSgQVtoe6T507sMD9WXQQYyFYJMqptiGJmAXLN3sihZcyDTbRh+Rlg Ea6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=eAQTARqB; 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 p44si18581782pjp.0.2019.07.25.19.11.43; Thu, 25 Jul 2019 19:11:43 -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=eAQTARqB; 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 S1726005AbfGZCLl (ORCPT + 29 others); Thu, 25 Jul 2019 22:11:41 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:63576 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725819AbfGZCLl (ORCPT ); Thu, 25 Jul 2019 22:11:41 -0400 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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 2.17.1 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