Merge pull request torvalds#485 from wedsonaf/panic-source

rust: report file and line number that caused a panic.
ojeda · Aug 20, 2021 · d04e27c · d04e27c
2 parents 9f9b29b + e1bd831
commit d04e27c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/rust/compiler_builtins.rs b/rust/compiler_builtins.rs
@@ -133,14 +133,3 @@ define_panicking_intrinsics!("`u64` division/modulo should not be used", {
     __aeabi_uldivmod,
     __mulodi4,
 });
-
-extern "C" {
-    fn rust_helper_BUG() -> !;
-}
-
-#[panic_handler]
-fn panic(_info: &core::panic::PanicInfo<'_>) -> ! {
-    unsafe {
-        rust_helper_BUG();
-    }
-}
diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs
@@ -228,3 +228,14 @@ macro_rules! container_of {
         ptr.wrapping_offset(-offset) as *const $type
     }}
 }
+
+#[cfg(not(any(testlib, test)))]
+#[panic_handler]
+fn panic(info: &core::panic::PanicInfo<'_>) -> ! {
+    extern "C" {
+        fn rust_helper_BUG() -> !;
+    }
+    pr_emerg!("{}\n", info);
+    // SAFETY: FFI call.
+    unsafe { rust_helper_BUG() };
+}