From: Thiebaud Weksteen <tweek@google.com>
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 <tweek@google.com>
Subject: [PATCH 1/3] tpm: Move eventlog files to a subdirectory
Date: Wed, 11 Apr 2018 14:54:59 +0200 [thread overview]
Message-ID: <20180411125501.188477-2-tweek@google.com> (raw)
In-Reply-To: <20180411125501.188477-1-tweek@google.com>
Signed-off-by: Thiebaud Weksteen <tweek@google.com>
---
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 <linux/acpi.h>
#include <linux/tpm_eventlog.h>
-#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 <linux/efi.h>
#include <linux/tpm_eventlog.h>
-#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 96fd5646f866..c38c37e41389 100644
--- a/drivers/char/tpm/tpm_eventlog_of.c
+++ b/drivers/char/tpm/eventlog/of.c
@@ -19,7 +19,7 @@
#include <linux/of.h>
#include <linux/tpm_eventlog.h>
-#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 <linux/slab.h>
#include <linux/tpm_eventlog.h>
-#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 <linux/slab.h>
#include <linux/tpm_eventlog.h>
-#include "tpm.h"
+#include "../tpm.h"
/*
* calc_tpm2_event_size() - calculate the event size, where event
--
2.17.0.484.g0c8726318c-goog
next prev parent reply other threads:[~2018-04-11 12:55 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-11 12:54 [PATCH 0/3] Refactor TPM event log code Thiebaud Weksteen
2018-04-11 12:54 ` Thiebaud Weksteen [this message]
2018-04-12 0:19 ` [PATCH 1/3] tpm: Move eventlog files to a subdirectory kbuild test robot
2018-04-11 12:55 ` [PATCH 2/3] tpm: Move shared eventlog functions to common.c Thiebaud Weksteen
2018-04-11 12:55 ` [PATCH 3/3] tpm: Move eventlog declarations to its own header Thiebaud Weksteen
2018-04-12 7:12 ` Jarkko Sakkinen
2018-04-12 7:14 ` Jarkko Sakkinen
2018-04-12 7:09 ` [PATCH 0/3] Refactor TPM event log code Jarkko Sakkinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180411125501.188477-2-tweek@google.com \
--to=tweek@google.com \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nayna@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.