Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 2 Feb 2023 11:22:34 GMT
From:      Emmanuel Vadot <manu@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 4a90c1df208e - stable/13 - linuxkpi: Move cpu_relax out of ifdef for x86
Message-ID:  <202302021122.312BMYlm090668@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by manu:

URL: https://cgit.FreeBSD.org/src/commit/?id=4a90c1df208ed24bbeade42717c21faad0b13724

commit 4a90c1df208ed24bbeade42717c21faad0b13724
Author:     Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2022-11-10 11:50:51 +0000
Commit:     Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2023-02-02 11:20:58 +0000

    linuxkpi: Move cpu_relax out of ifdef for x86
    
    It's needed by drm-kmod and this allow building on arm64 and powerpc.
    
    Reported by:    jhibbits
    Sponsored by:   Beckhoff Automation GmbH & Co. KG
    
    (cherry picked from commit ee247fc1e93e6d37cf509a640a7d273616056f5d)
---
 sys/compat/linuxkpi/common/include/asm/processor.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/compat/linuxkpi/common/include/asm/processor.h b/sys/compat/linuxkpi/common/include/asm/processor.h
index ee2f48b50b44..86d4ab9de98f 100644
--- a/sys/compat/linuxkpi/common/include/asm/processor.h
+++ b/sys/compat/linuxkpi/common/include/asm/processor.h
@@ -39,9 +39,9 @@ struct cpuinfo_x86 {
 	uint16_t	x86_max_cores;
 };
 
-#define	cpu_relax()	cpu_spinwait()
-
 extern struct cpuinfo_x86	boot_cpu_data;
 #endif
 
+#define	cpu_relax()	cpu_spinwait()
+
 #endif	/* _LINUXKPI_ASM_PROCESSOR_H_ */



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302021122.312BMYlm090668>