From patchwork Thu Apr 12 10:13:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Thi=C3=A9baud_Weksteen?= X-Patchwork-Id: 10338155 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 D111A60134 for ; Thu, 12 Apr 2018 10:15:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BE12928765 for ; Thu, 12 Apr 2018 10:15:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B1D9B28769; Thu, 12 Apr 2018 10:15:26 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, 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 318B428765 for ; Thu, 12 Apr 2018 10:15:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752602AbeDLKOV (ORCPT ); Thu, 12 Apr 2018 06:14:21 -0400 Received: from mail-vk0-f73.google.com ([209.85.213.73]:39913 "EHLO mail-vk0-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752775AbeDLKOS (ORCPT ); Thu, 12 Apr 2018 06:14:18 -0400 Received: by mail-vk0-f73.google.com with SMTP id t81so2943056vkb.6 for ; Thu, 12 Apr 2018 03:14:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:date:in-reply-to:message-id:references:subject:from:to :cc; bh=QbzJdC+5T+eAxpdv9hvSbyrKCrlTN5Y0fYNyH///sko=; b=pzS876xraiRg48LVj9YThC1WpLiD2jbky3O0VqRNCfKwKB9jcZmQRvDpq5KKZN4XS5 EL0aJrCuWGc0rQao54BnF5fTqzE3iVLSc/81W71b9PIYv6yP77FE7hUt/NtcAmphRvN5 1I9h6I4ClXCjikoMcw9hVcSZ5VntZKbpkCNGkI2iCBOsBIFmZKEFf1I80xypp2M04ndl IDBr+b7vTae5mQbSis05BXfEh4kDR4hx+QJ2BwE8SGxz4gGZUtDIp8ar7zD43jv8rsgP tJ3NM6STIyCwLU/EMSSTdS1yRHd+GlnvaHAONZG07LQak0tp6aW2kmrDcY3x76LfXZaM z/4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:date:in-reply-to:message-id :references:subject:from:to:cc; bh=QbzJdC+5T+eAxpdv9hvSbyrKCrlTN5Y0fYNyH///sko=; b=B+wLzsoq5mHobxeu26rSNni9YU5kk1Dup1TZblVAL6BVlqHB90x2rIEfwLJmcXjIQu d+H+jk+X0Npe8HauDQj1HGaO+jW8EwLr+apoxIG3jdcAQT05KQOCOYNcaVFVuEGrp8ww ybgd7KRtpRGT3KERz5r+3odGCZX95WIpaGzs6o3G6NYKU5/T8oLA8UBVpz/rJjdRW/oJ mPgatSaTAf69Fn0mQgyDQtwWwHX07g8pSfs3mgvwu/YJi9eHoKyFbNBDc/priSOelw2z T+L+vsvrbkkq9SM07jk92KikNkQE3vJr7LnanBPJOgE2+i9etqJcQDat5jJ6l/LhIDvc gKIw== X-Gm-Message-State: ALQs6tAW11VhXE4vx0z4FICNOyBwyfggUDSZbD+XuRTaq1iAalxVJj4G NYFmDqWRXZWaiYZGHaB0DAKciBFUlw== X-Google-Smtp-Source: AIpwx48+yTyhGtKcy0CeifHFbmGddg8bEkBz4y4RQktm0S6fr7LCrEphnmWdrTbLl4Piz0tsLMG/xk4vng== MIME-Version: 1.0 X-Received: by 10.176.82.116 with SMTP id j49mr122782uaa.11.1523528057538; Thu, 12 Apr 2018 03:14:17 -0700 (PDT) Date: Thu, 12 Apr 2018 12:13:48 +0200 In-Reply-To: <20180412101350.210547-1-tweek@google.com> Message-Id: <20180412101350.210547-3-tweek@google.com> References: <20180412101350.210547-1-tweek@google.com> X-Mailer: git-send-email 2.17.0.484.g0c8726318c-goog Subject: [PATCH v2 2/4] tpm: Move eventlog files to a subdirectory From: Thiebaud Weksteen To: jarkko.sakkinen@linux.intel.com, nayna@linux.vnet.ibm.com, linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org, tweek@google.com Cc: linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org, Thiebaud Weksteen 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 Signed-off-by: Thiebaud Weksteen Suggested-by: Jarkko Sakkinen Reviewed-by: Jarkko Sakkinen Tested-by: Jarkko Sakkinen --- drivers/char/tpm/Makefile | 8 ++++---- drivers/char/tpm/{tpm_eventlog_acpi.c => eventlog/acpi.c} | 2 +- drivers/char/tpm/{tpm_eventlog_efi.c => eventlog/efi.c} | 2 +- drivers/char/tpm/{tpm_eventlog_of.c => eventlog/of.c} | 2 +- drivers/char/tpm/{tpm1_eventlog.c => eventlog/tpm1.c} | 2 +- drivers/char/tpm/{tpm2_eventlog.c => eventlog/tpm2.c} | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) rename drivers/char/tpm/{tpm_eventlog_acpi.c => eventlog/acpi.c} (99%) rename drivers/char/tpm/{tpm_eventlog_efi.c => eventlog/efi.c} (98%) rename drivers/char/tpm/{tpm_eventlog_of.c => eventlog/of.c} (99%) rename drivers/char/tpm/{tpm1_eventlog.c => eventlog/tpm1.c} (99%) rename drivers/char/tpm/{tpm2_eventlog.c => eventlog/tpm2.c} (99%) diff --git a/drivers/char/tpm/Makefile b/drivers/char/tpm/Makefile index acd758381c58..5dcf5bd35a3d 100644 --- a/drivers/char/tpm/Makefile +++ b/drivers/char/tpm/Makefile @@ -4,11 +4,11 @@ # obj-$(CONFIG_TCG_TPM) += tpm.o tpm-y := tpm-interface.o tpm-dev.o tpm-sysfs.o tpm-chip.o tpm2-cmd.o \ - tpm-dev-common.o tpmrm-dev.o tpm1_eventlog.o tpm2_eventlog.o \ + tpm-dev-common.o tpmrm-dev.o eventlog/tpm1.o eventlog/tpm2.o \ tpm2-space.o -tpm-$(CONFIG_ACPI) += tpm_ppi.o tpm_eventlog_acpi.o -tpm-$(CONFIG_EFI) += tpm_eventlog_efi.o -tpm-$(CONFIG_OF) += tpm_eventlog_of.o +tpm-$(CONFIG_ACPI) += tpm_ppi.o eventlog/acpi.o +tpm-$(CONFIG_EFI) += eventlog/efi.o +tpm-$(CONFIG_OF) += eventlog/of.o obj-$(CONFIG_TCG_TIS_CORE) += tpm_tis_core.o obj-$(CONFIG_TCG_TIS) += tpm_tis.o obj-$(CONFIG_TCG_TIS_SPI) += tpm_tis_spi.o diff --git a/drivers/char/tpm/tpm_eventlog_acpi.c b/drivers/char/tpm/eventlog/acpi.c similarity index 99% rename from drivers/char/tpm/tpm_eventlog_acpi.c rename to drivers/char/tpm/eventlog/acpi.c index 66f19e93c216..8476be2e9526 100644 --- a/drivers/char/tpm/tpm_eventlog_acpi.c +++ b/drivers/char/tpm/eventlog/acpi.c @@ -27,7 +27,7 @@ #include #include -#include "tpm.h" +#include "../tpm.h" struct acpi_tcpa { struct acpi_table_header hdr; diff --git a/drivers/char/tpm/tpm_eventlog_efi.c b/drivers/char/tpm/eventlog/efi.c similarity index 98% rename from drivers/char/tpm/tpm_eventlog_efi.c rename to drivers/char/tpm/eventlog/efi.c index e3f9ffd341d2..e1593c5271a4 100644 --- a/drivers/char/tpm/tpm_eventlog_efi.c +++ b/drivers/char/tpm/eventlog/efi.c @@ -14,7 +14,7 @@ #include #include -#include "tpm.h" +#include "../tpm.h" /* read binary bios log from EFI configuration table */ int tpm_read_log_efi(struct tpm_chip *chip) diff --git a/drivers/char/tpm/tpm_eventlog_of.c b/drivers/char/tpm/eventlog/of.c similarity index 99% rename from drivers/char/tpm/tpm_eventlog_of.c rename to drivers/char/tpm/eventlog/of.c index d74568d58a66..d98c184d5c13 100644 --- a/drivers/char/tpm/tpm_eventlog_of.c +++ b/drivers/char/tpm/eventlog/of.c @@ -19,7 +19,7 @@ #include #include -#include "tpm.h" +#include "../tpm.h" int tpm_read_log_of(struct tpm_chip *chip) { diff --git a/drivers/char/tpm/tpm1_eventlog.c b/drivers/char/tpm/eventlog/tpm1.c similarity index 99% rename from drivers/char/tpm/tpm1_eventlog.c rename to drivers/char/tpm/eventlog/tpm1.c index add798bd69d0..d6aea3ca950e 100644 --- a/drivers/char/tpm/tpm1_eventlog.c +++ b/drivers/char/tpm/eventlog/tpm1.c @@ -28,7 +28,7 @@ #include #include -#include "tpm.h" +#include "../tpm.h" static const char* tcpa_event_type_strings[] = { diff --git a/drivers/char/tpm/tpm2_eventlog.c b/drivers/char/tpm/eventlog/tpm2.c similarity index 99% rename from drivers/char/tpm/tpm2_eventlog.c rename to drivers/char/tpm/eventlog/tpm2.c index 1ce4411292ba..f0723fa9ae14 100644 --- a/drivers/char/tpm/tpm2_eventlog.c +++ b/drivers/char/tpm/eventlog/tpm2.c @@ -23,7 +23,7 @@ #include #include -#include "tpm.h" +#include "../tpm.h" /* * calc_tpm2_event_size() - calculate the event size, where event