diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2025-06-06 11:01:11 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-07-10 16:03:15 +0200 |
| commit | 69283b3fd463edb3001c32242a2dde3b00dd8756 (patch) | |
| tree | c1acd3eac2a627b11c1a3d3ba9e20273d1c761ae | |
| parent | 71f89fab5cc95d8069eb5b2aaea802f3bdb71c29 (diff) | |
| download | linux-69283b3fd463edb3001c32242a2dde3b00dd8756.tar.gz linux-69283b3fd463edb3001c32242a2dde3b00dd8756.tar.bz2 linux-69283b3fd463edb3001c32242a2dde3b00dd8756.zip | |
ata: pata_cs5536: fix build on 32-bit UML
[ Upstream commit fe5b391fc56f77cf3c22a9dd4f0ce20db0e3533f ]
On 32-bit ARCH=um, CONFIG_X86_32 is still defined, so it
doesn't indicate building on real X86 machines. There's
no MSR on UML though, so add a check for CONFIG_X86.
Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Link: https://lore.kernel.org/r/20250606090110.15784-2-johannes@sipsolutions.net
Signed-off-by: Niklas Cassel <cassel@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/ata/pata_cs5536.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/pata_cs5536.c b/drivers/ata/pata_cs5536.c index b811efd2cc34..73e81e160c91 100644 --- a/drivers/ata/pata_cs5536.c +++ b/drivers/ata/pata_cs5536.c @@ -27,7 +27,7 @@ #include <scsi/scsi_host.h> #include <linux/dmi.h> -#ifdef CONFIG_X86_32 +#if defined(CONFIG_X86) && defined(CONFIG_X86_32) #include <asm/msr.h> static int use_msr; module_param_named(msr, use_msr, int, 0644); |