From: Pavel Popov <pavel.e.popov@intel.com>
To: "Rafael J. Wysocki" <rafael@kernel.org>,
"Viresh Kumar" <viresh.kumar@linaro.org>,
"Jani Nikula" <jani.nikula@linux.intel.com>,
"Joonas Lahtinen" <joonas.lahtinen@linux.intel.com>,
"Rodrigo Vivi" <rodrigo.vivi@intel.com>,
"Tvrtko Ursulin" <tursulin@ursulin.net>,
"Alex Deucher" <alexander.deucher@amd.com>,
"Christian König" <christian.koenig@amd.com>,
"Hans de Goede" <hansg@kernel.org>,
"Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>,
"Peter Huewe" <peterhuewe@gmx.de>,
"Jarkko Sakkinen" <jarkko@kernel.org>,
"Tom Lendacky" <thomas.lendacky@amd.com>,
"Herbert Xu" <herbert@gondor.apana.org.au>
Cc: Pavel Popov <pavel.e.popov@intel.com>,
Leon Romanovsky <leon@kernel.org>,
Bjorn Helgaas <bhelgaas@google.com>,
Logan Gunthorpe <logang@deltatee.com>,
Arnd Bergmann <arnd@arndb.de>, Len Brown <lenb@kernel.org>,
Sakari Ailus <sakari.ailus@linux.intel.com>,
Jason Gunthorpe <jgg@ziepe.ca>, David Airlie <airlied@gmail.com>,
Simona Vetter <simona@ffwll.ch>,
"David S . Miller" <davem@davemloft.net>,
x86@kernel.org, linux-acpi@vger.kernel.org,
linux-pm@vger.kernel.org, intel-gfx@lists.freedesktop.org,
amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
platform-driver-x86@vger.kernel.org,
linux-integrity@vger.kernel.org, linux-crypto@vger.kernel.org,
linux-arch@vger.kernel.org, linux-pci@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 6/7] tpm: Include <asm/cpu_device_id.h> unconditionally
Date: Wed, 11 Nov 2026 16:48:19 -0700 [thread overview]
Message-ID: <20261111234821.4814-7-pavel.e.popov@intel.com> (raw)
In-Reply-To: <20261111234821.4814-1-pavel.e.popov@intel.com>
<asm/cpu_device_id.h> now has a generic version, so the #ifdef
CONFIG_X86 around the include is no longer needed.
Signed-off-by: Pavel Popov <pavel.e.popov@intel.com>
---
Depends on <asm-generic/cpu_device_id.h> from [1]; please apply after
it is in mainline.
[1] https://lore.kernel.org/r/20261111234439.4098-1-pavel.e.popov@intel.com
drivers/char/tpm/tpm.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index fa554c5ad80..ad1534aa00c 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -28,9 +28,7 @@
#include <linux/tpm.h>
#include <linux/tpm_eventlog.h>
-#ifdef CONFIG_X86
#include <asm/cpu_device_id.h>
-#endif
#define TPM_MINOR 224 /* officially assigned */
#define TPM_NUM_DEVICES 65536
--
2.54.0
next prev parent reply other threads:[~2026-11-11 23:48 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-11 23:48 [PATCH 0/7] Include <asm/cpu_device_id.h> without #ifdef CONFIG_X86 Pavel Popov
2026-11-11 23:48 ` [PATCH 1/7] ACPI: mipi-disco-img: Include <asm/cpu_device_id.h> unconditionally Pavel Popov
2026-11-11 23:48 ` [PATCH 2/7] drm/i915: " Pavel Popov
2026-11-11 23:48 ` [PATCH 3/7] drm/amdgpu: " Pavel Popov
2026-11-11 23:48 ` [PATCH 4/7] cpufreq: ondemand: " Pavel Popov
2026-11-11 23:48 ` [PATCH 5/7] platform/x86: Include <asm/cpu_device_id.h> unconditionally in soc.h Pavel Popov
2026-11-11 23:48 ` Pavel Popov [this message]
2026-11-11 23:48 ` [PATCH 7/7] crypto: ccp - Drop unused <asm/cpu_device_id.h> include Pavel Popov
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=20261111234821.4814-7-pavel.e.popov@intel.com \
--to=pavel.e.popov@intel.com \
--cc=airlied@gmail.com \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=arnd@arndb.de \
--cc=bhelgaas@google.com \
--cc=christian.koenig@amd.com \
--cc=davem@davemloft.net \
--cc=dri-devel@lists.freedesktop.org \
--cc=hansg@kernel.org \
--cc=herbert@gondor.apana.org.au \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=jarkko@kernel.org \
--cc=jgg@ziepe.ca \
--cc=joonas.lahtinen@linux.intel.com \
--cc=lenb@kernel.org \
--cc=leon@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=logang@deltatee.com \
--cc=peterhuewe@gmx.de \
--cc=platform-driver-x86@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=rodrigo.vivi@intel.com \
--cc=sakari.ailus@linux.intel.com \
--cc=simona@ffwll.ch \
--cc=thomas.lendacky@amd.com \
--cc=tursulin@ursulin.net \
--cc=viresh.kumar@linaro.org \
--cc=x86@kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®