From 1587d329c1525f5ce8eabd55b5407844d809ba7a Mon Sep 17 00:00:00 2001 From: Taylor R Campbell Date: Mon, 20 Feb 2023 12:53:58 +0000 Subject: [PATCH] mips/asm.h: Make membar macros conditional on MULTIPROCESSOR. For !MULTIPROCESSOR, define them to be empty or nop as appropriate. --- sys/arch/mips/include/asm.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/arch/mips/include/asm.h b/sys/arch/mips/include/asm.h index 8673c5063e1e..e896114a5939 100644 --- a/sys/arch/mips/include/asm.h +++ b/sys/arch/mips/include/asm.h @@ -59,6 +59,7 @@ #if defined(_KERNEL_OPT) #include "opt_gprof.h" +#include "opt_multiprocessor.h" #endif #ifdef __ASSEMBLER__ @@ -573,7 +574,7 @@ _C_LABEL(x): #endif /* compiler define */ -#if defined(__OCTEON__) +#if defined(MULTIPROCESSOR) && defined(__OCTEON__) /* * See common/lib/libc/arch/mips/atomic/membar_ops.S for notes on * Octeon memory ordering guarantees and barriers. @@ -591,7 +592,7 @@ _C_LABEL(x): #define SYNC_REL sync 4 #define BDSYNC_PLUNGER sync 4 #define SYNC_PLUNGER sync 4 -#elif __mips >= 3 || !defined(__mips_o32) +#elif defined(MULTIPROCESSOR) && (__mips >= 3 || !defined(__mips_o32)) #define LLSCSYNC /* nothing */ #define BDSYNC sync #define BDSYNC_ACQ sync