samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ata: pata_cs5536: fix build on 32-bit UML

Browse Source 
[ 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>
This commit is contained in:
Johannes Berg
2025-06-06 11:01:11 +02:00
committed by Greg Kroah-Hartman
parent 71f89fab5c
commit 69283b3fd4
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/ata/pata_cs5536.c
View File

@@ -27,7 +27,7 @@
#include <scsi/scsi_host.h> #include <scsi/scsi_host.h>
#include <linux/dmi.h> #include <linux/dmi.h>
#ifdef CONFIG_X86_32 #if defined(CONFIG_X86) && defined(CONFIG_X86_32)
#include <asm/msr.h> #include <asm/msr.h>
static int use_msr; static int use_msr;
module_param_named(msr, use_msr, int, 0644); module_param_named(msr, use_msr, int, 0644);