Skip to content

Commit eb6fdc8

Browse files
jmberg-intelgregkh
authored andcommitted
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 <[email protected]> Signed-off-by: Johannes Berg <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Niklas Cassel <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent da9a548 commit eb6fdc8

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/ata/pata_cs5536.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include <scsi/scsi_host.h>
2828
#include <linux/dmi.h>
2929

30-
#ifdef CONFIG_X86_32
30+
#if defined(CONFIG_X86) && defined(CONFIG_X86_32)
3131
#include <asm/msr.h>
3232
static int use_msr;
3333
module_param_named(msr, use_msr, int, 0644);

0 commit comments

Comments
 (0)