The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9f6097d6a691d67df463b32193218cb9d09ce02b
commit 9f6097d6a691d67df463b32193218cb9d09ce02b Author: Ed Maste <[email protected]> AuthorDate: 2022-10-17 18:36:09 +0000 Commit: Ed Maste <[email protected]> CommitDate: 2022-10-17 20:31:20 +0000 linuxkpi: retire now-unused MIPS support Reviewed by: bz, manu Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37023 --- sys/compat/linuxkpi/common/include/asm/atomic.h | 4 +--- sys/compat/linuxkpi/common/include/asm/atomic64.h | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/asm/atomic.h b/sys/compat/linuxkpi/common/include/asm/atomic.h index d7e5338c0356..b4154274f3f8 100644 --- a/sys/compat/linuxkpi/common/include/asm/atomic.h +++ b/sys/compat/linuxkpi/common/include/asm/atomic.h @@ -166,9 +166,7 @@ atomic_cmpxchg(atomic_t *v, int old, int new) #define LINUXKPI_ATOMIC_16(...) #endif -#if !(defined(i386) || (defined(__mips__) && !(defined(__mips_n32) || \ - defined(__mips_n64))) || (defined(__powerpc__) && \ - !defined(__powerpc64__))) +#if !(defined(i386) || (defined(__powerpc__) && !defined(__powerpc64__))) #define LINUXKPI_ATOMIC_64(...) __VA_ARGS__ #else #define LINUXKPI_ATOMIC_64(...) diff --git a/sys/compat/linuxkpi/common/include/asm/atomic64.h b/sys/compat/linuxkpi/common/include/asm/atomic64.h index 4ee0fa5ecf84..0d9634206a01 100644 --- a/sys/compat/linuxkpi/common/include/asm/atomic64.h +++ b/sys/compat/linuxkpi/common/include/asm/atomic64.h @@ -125,8 +125,7 @@ atomic64_fetch_add_unless(atomic64_t *v, int64_t a, int64_t u) static inline int64_t atomic64_xchg(atomic64_t *v, int64_t i) { -#if !((defined(__mips__) && !(defined(__mips_n32) || defined(__mips_n64))) || \ - (defined(__powerpc__) && !defined(__powerpc64__))) +#if !(defined(__powerpc__) && !defined(__powerpc64__)) return (atomic_swap_64(&v->counter, i)); #else int64_t ret = atomic64_read(v);
