Index: arch/ia32/src/drivers/i8259.c
===================================================================
--- arch/ia32/src/drivers/i8259.c	(revision 3701250dd6e8622ff20919f56f6fa44106e39c1e)
+++ arch/ia32/src/drivers/i8259.c	(revision 14df080724e02282967a019d3c0e3f89cd15fe7e)
@@ -121,4 +121,6 @@
 void pic_spurious(int n, istate_t *istate)
 {
+#ifdef CONFIG_DEBUG
 	printf("cpu%d: PIC spurious interrupt\n", CPU->id);
+#endif
 }
Index: arch/ia32/src/smp/apic.c
===================================================================
--- arch/ia32/src/smp/apic.c	(revision 3701250dd6e8622ff20919f56f6fa44106e39c1e)
+++ arch/ia32/src/smp/apic.c	(revision 14df080724e02282967a019d3c0e3f89cd15fe7e)
@@ -172,5 +172,7 @@
 void apic_spurious(int n, istate_t *istate)
 {
+#ifdef CONFIG_DEBUG
 	printf("cpu%d: APIC spurious interrupt\n", CPU->id);
+#endif
 }
 
Index: generic/src/synch/spinlock.c
===================================================================
--- generic/src/synch/spinlock.c	(revision 3701250dd6e8622ff20919f56f6fa44106e39c1e)
+++ generic/src/synch/spinlock.c	(revision 14df080724e02282967a019d3c0e3f89cd15fe7e)
@@ -70,4 +70,5 @@
  */
 #ifdef CONFIG_DEBUG_SPINLOCK
+#define DEADLOCK_THRESHOLD	100000000
 void spinlock_lock_debug(spinlock_t *sl)
 {
@@ -102,5 +103,5 @@
 			continue;
 #endif
-		if (i++ > 10000000) {
+		if (i++ > DEADLOCK_THRESHOLD) {
 			printf("cpu%d: looping on spinlock %.*p:%s, caller=%.*p",
 			       CPU->id, sizeof(__address) * 2, sl, sl->name, sizeof(__address) * 2, CALLER);