diff --git a/src/cpu/x86/tsc/delay_tsc.c b/src/cpu/x86/tsc/delay_tsc.c
index d5cf50fab7..eaf85d2c76 100644
--- a/src/cpu/x86/tsc/delay_tsc.c
+++ b/src/cpu/x86/tsc/delay_tsc.c
@@ -160,11 +160,7 @@ void udelay(unsigned us)
         count = rdtscll();
         stop = clocks + count;
         while(stop > count) {
-#ifdef CONFIG_SMP
-#if CONFIG_SMP == 1
 		cpu_relax();
-#endif
-#endif
 		count = rdtscll();
         }
 }
diff --git a/src/include/smp/spinlock.h b/src/include/smp/spinlock.h
index 29f348dea0..aedd85b0ab 100644
--- a/src/include/smp/spinlock.h
+++ b/src/include/smp/spinlock.h
@@ -19,6 +19,7 @@ typedef struct { int gcc_is_buggy; } spinlock_t;
 #define spin_unlock_wait(lock)	do {} while(0)
 #define spin_lock(lock)		do {} while(0)
 #define spin_unlock(lock)	do {} while(0)
+#define cpu_relax()		do {} while(0)
 #endif
 
 #endif /* SMP_SPINLOCK_H */