summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Schildt <jschildt@gmail.com>2005-10-25 21:28:41 +0000
committerJason Schildt <jschildt@gmail.com>2005-10-25 21:28:41 +0000
commitbc6281a8fedd68195414d6dc6744914054b3f39d (patch)
treec012a6168f17c131dee135b301e4a3cb53de41fc
parentc0d2d783978bf41b4182349f4d313386d1b3bfff (diff)
- See Issue Tracker id-6 "lnxi-patch-6-replacement"
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2070 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-rw-r--r--src/cpu/x86/tsc/delay_tsc.c4
-rw-r--r--src/include/smp/spinlock.h1
2 files changed, 1 insertions, 4 deletions
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 */