Merge pull request #611 in SEL4/sel4 from ~HALMATARY/sel4:VER/FIX to master

* commit 'd5f8fe01274ffb70eeb2964ab5afd9a6c71f1468':
  SMP: guard arch_pause() with #ifdef for verification purposes

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 */

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,