diff --git a/src/panic.rs b/src/panic.rs
index 1867b4a..2133061 100644
--- a/src/panic.rs
+++ b/src/panic.rs
@@ -3,7 +3,7 @@
 use core::alloc::Layout;
 use core::panic::PanicInfo;
 
-use crate::interrupt;
+use crate::{cpu_id, context, interrupt};
 
 #[lang = "eh_personality"]
 #[no_mangle]
@@ -17,6 +17,9 @@ pub extern "C" fn rust_begin_unwind(info: &PanicInfo) -> ! {
 
     unsafe { interrupt::stack_trace(); }
 
+    println!("CPU {}, PID {:?}", cpu_id(), context::context_id());
+    //WARNING: name cannot be grabed, it may deadlock
+
     println!("HALT");
     loop {
         unsafe { interrupt::halt(); }