git: 8aa9315b537d - stable/14 - LinuxKPI: Define ioread64() in linux/io.h only on 64 bit archs.

From: Vladimir Kondratyev <wulf_at_FreeBSD.org>
Date: Sat, 17 Feb 2024 21:33:18 UTC
The branch stable/14 has been updated by wulf:

URL: https://cgit.FreeBSD.org/src/commit/?id=8aa9315b537d505977d77d7c78fafe5a495a6601

commit 8aa9315b537d505977d77d7c78fafe5a495a6601
Author:     Vladimir Kondratyev <wulf@FreeBSD.org>
AuthorDate: 2023-12-24 12:48:06 +0000
Commit:     Vladimir Kondratyev <wulf@FreeBSD.org>
CommitDate: 2024-02-17 20:58:39 +0000

    LinuxKPI: Define ioread64() in linux/io.h only on 64 bit archs.
    
    32 bit archs includes nonatomic version from linux/io-64-nonatomic-*.h
    
    Sponsored by:   Serenity Cyber Security, LLC
    Fixes:          dcfc983373c3 ("LinuxKPI: Implement ioread64()")
    MFC after:      1 week
    
    (cherry picked from commit 73ccd188c43a6cd52a12ac33411896220b2d2e54)
---
 sys/compat/linuxkpi/common/include/linux/io.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sys/compat/linuxkpi/common/include/linux/io.h b/sys/compat/linuxkpi/common/include/linux/io.h
index d70cda77400e..bce70ed0cb8d 100644
--- a/sys/compat/linuxkpi/common/include/linux/io.h
+++ b/sys/compat/linuxkpi/common/include/linux/io.h
@@ -350,6 +350,7 @@ ioread32be(const volatile void *addr)
 }
 #define	ioread32be(addr)	ioread32be(addr)
 
+#ifdef __LP64__
 #undef ioread64
 static inline uint64_t
 ioread64(const volatile void *addr)
@@ -357,6 +358,7 @@ ioread64(const volatile void *addr)
 	return (readq(addr));
 }
 #define	ioread64(addr)		ioread64(addr)
+#endif
 
 #undef iowrite8
 static inline void