From: Johannes Berg <johannes.berg@intel.com>

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>
---
 drivers/ata/pata_cs5536.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);
-- 
2.49.0

On Fri, 06 Jun 2025 11:01:11 +0200, Johannes Berg wrote:
> 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.
> 
> 

Applied to libata/linux.git (for-6.16-fixes), thanks!

[1/1] ata: pata_cs5536: fix build on 32-bit UML
      https://git.kernel.org/libata/linux/c/fe5b391f

Kind regards,
Niklas

Hello Johannes,

On Fri, Jun 06, 2025 at 11:01:11AM +0200, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@intel.com>
> 
> 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>

Reported-by: should be followed by either a Closes: or Link: tag, see:
https://docs.kernel.org/process/submitting-patches.html#using-reported-by-tested-by-reviewed-by-suggested-by-and-fixes


Kind regards,
Niklas

> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> ---
>  drivers/ata/pata_cs5536.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> 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);
> -- 
> 2.49.0
>

On Mon, 2025-06-09 at 11:44 +0200, Niklas Cassel wrote:
> Hello Johannes,
> 
> On Fri, Jun 06, 2025 at 11:01:11AM +0200, Johannes Berg wrote:
> > From: Johannes Berg <johannes.berg@intel.com>
> > 
> > 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>
> 
> Reported-by: should be followed by either a Closes: or Link: tag, see:
> https://docs.kernel.org/process/submitting-patches.html#using-reported-by-tested-by-reviewed-by-suggested-by-and-fixes

Here you go:

Link: Arnd said so on IRC.

johannes