- See Issue Tracker id-6 "lnxi-patch-6-replacement"



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2070 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
diff --git a/src/cpu/x86/tsc/delay_tsc.c b/src/cpu/x86/tsc/delay_tsc.c
index d5cf50f..eaf85d2 100644
--- a/src/cpu/x86/tsc/delay_tsc.c
+++ b/src/cpu/x86/tsc/delay_tsc.c
@@ -160,11 +160,7 @@
         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 29f348d..aedd85b 100644
--- a/src/include/smp/spinlock.h
+++ b/src/include/smp/spinlock.h
@@ -19,6 +19,7 @@
 #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 */