diff --git a/Cargo.toml b/Cargo.toml
index 0fb581f896..6d4f059ace 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -83,6 +83,8 @@ default = [
   "serial_debug",
   "self_modifying",
   "x86_kvm_pv",
+  #"busy_panic",
+  #"drop_panic",
   #"syscall_debug"
 ]
 
diff --git a/src/sync/ordered.rs b/src/sync/ordered.rs
index a8cf6fa398..3ad286d35e 100644
--- a/src/sync/ordered.rs
+++ b/src/sync/ordered.rs
@@ -206,7 +206,7 @@ impl<L: Level, T: Default> Default for Mutex<L, T> {
 }
 
 #[cfg(feature = "busy_panic")]
-pub const DEADLOCK_SPIN_CAP: usize = 1_000_000_000;
+pub const DEADLOCK_SPIN_CAP: usize = 5000;
 
 impl<L: Level, T> Mutex<L, T> {
     /// Creates a new mutex in an unlocked state ready for use