Add CONFIG_WARNINGS_ARE_ERRORS and set it for qemu.

[coreboot.git] / src / include / smp / spinlock.h

diff --git a/src/include/smp/spinlock.h b/src/include/smp/spinlock.h
index 77a0e51682d11cf5bed40fb34e5d0484ebf8b3b2..1b0b4fdde9cde85c22de0132117f66bff640e540 100644 (file)
--- a/src/include/smp/spinlock.h
+++ b/src/include/smp/spinlock.h
@@ -1,24 +1,17 @@
 #ifndef SMP_SPINLOCK_H
 #define SMP_SPINLOCK_H
 
-#ifdef CONFIG_SMP
+#if CONFIG_SMP == 1
 #include <arch/smp/spinlock.h>
 #else /* !CONFIG_SMP */
 
-/* Most GCC versions have a nasty bug with empty initializers */
-#if (__GNUC__ > 2) 
-typedef struct { } spinlock_t;
-#define SPIN_LOCK_UNLOCKED (spinlock_t) { }
-#else
-typedef struct { int gcc_is_buggy; } spinlock_t;
-#define SPIN_LOCK_UNLOCKED (spinlock_t) { 0 }
-#endif
-
+#define DECLARE_SPIN_LOCK(x)
 #define barrier()              do {} while(0)
 #define spin_is_locked(lock)   0
 #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 */