From d5f8fe01274ffb70eeb2964ab5afd9a6c71f1468 Mon Sep 17 00:00:00 2001 From: Hesham Almatary Date: Tue, 17 Jan 2017 14:45:39 +1100 Subject: [PATCH] SMP: guard arch_pause() with #ifdef for verification purposes --- include/arch/arm/arch/machine.h | 3 +++ include/arch/x86/arch/machine.h | 2 ++ 2 files changed, 5 insertions(+) diff --git a/include/arch/arm/arch/machine.h b/include/arch/arm/arch/machine.h index f9cd69659..63517c83c 100644 --- a/include/arch/arm/arch/machine.h +++ b/include/arch/arm/arch/machine.h @@ -60,10 +60,13 @@ static inline void clearMemoryRAM(word_t* ptr, word_t bits) addrFromPPtr(ptr)); } +#if CONFIG_MAX_NUM_NODES > 1 static inline void arch_pause(void) { /* TODO */ } +#endif + #endif /* __ASSEMBLER__ */ #endif /* __ARCH_MACHINE_H */ diff --git a/include/arch/x86/arch/machine.h b/include/arch/x86/arch/machine.h index caefadb41..0d714caa1 100644 --- a/include/arch/x86/arch/machine.h +++ b/include/arch/x86/arch/machine.h @@ -189,10 +189,12 @@ static inline uint64_t x86_rdtsc(void) return ((uint64_t) hi) << 32llu | (uint64_t) lo; } +#if CONFIG_MAX_NUM_NODES > 1 static inline void arch_pause(void) { asm volatile("pause"); } +#endif enum x86_vendor { X86_VENDOR_INTEL = 0,