diff mbox series

nvidiafb: fix build on 32-bit ARCH=um

Message ID 20250606090218.15826-2-johannes@sipsolutions.net
State New
Headers show
Series nvidiafb: fix build on 32-bit ARCH=um | expand

Commit Message

Johannes Berg June 6, 2025, 9:02 a.m. UTC 
From: Johannes Berg <johannes.berg@intel.com>

Now that ARCH=um no longer has IO port accesses, this driver
can no longer build as-is. Make the IO port calls not just
conditional on i386 but also !UML.

Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 drivers/video/fbdev/nvidia/nv_local.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Helge Deller June 6, 2025, 7:24 p.m. UTC | #1 
On 6/6/25 11:02, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@intel.com>
> 
> Now that ARCH=um no longer has IO port accesses, this driver
> can no longer build as-is. Make the IO port calls not just
> conditional on i386 but also !UML.
> 
> Reported-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> ---
>   drivers/video/fbdev/nvidia/nv_local.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

Applied to fbdev git tree.

Thanks!
Helge
diff mbox series

Patch

diff --git a/drivers/video/fbdev/nvidia/nv_local.h b/drivers/video/fbdev/nvidia/nv_local.h
index 68e508daa417..93aff35305a9 100644
--- a/drivers/video/fbdev/nvidia/nv_local.h
+++ b/drivers/video/fbdev/nvidia/nv_local.h
@@ -80,7 +80,7 @@ 
      (par)->dmaFree -= ((size) + 1);          \
 }
 
-#if defined(__i386__)
+#if defined(__i386__) && !defined(CONFIG_UML)
 #define _NV_FENCE() outb(0, 0x3D0);
 #else
 #define _NV_FENCE() mb();