diff --git a/pkgs/os-specific/linux/kernel/linux-612-rust-185.patch b/pkgs/os-specific/linux/kernel/linux-612-rust-185.patch new file mode 100644 index 000000000000..b858f274d3ee --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-612-rust-185.patch @@ -0,0 +1,13 @@ +diff --git a/drivers/gpu/drm/drm_panic_qr.rs b/drivers/gpu/drm/drm_panic_qr.rs +index 447740d79d3d..da405d18d8a8 100644 +--- a/drivers/gpu/drm/drm_panic_qr.rs ++++ b/drivers/gpu/drm/drm_panic_qr.rs +@@ -931,7 +931,7 @@ fn draw_all(&mut self, data: impl Iterator) { + /// They must remain valid for the duration of the function call. + #[no_mangle] + pub unsafe extern "C" fn drm_panic_qr_generate( +- url: *const i8, ++ url: *const core::ffi::c_char, + data: *mut u8, + data_len: usize, + data_size: usize, diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index ddda525e70b0..a39070c4a6c2 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -76,4 +76,9 @@ name = "export-rt-sched-migrate"; patch = ./export-rt-sched-migrate.patch; }; + + linux-612-rust-185 = { + name = "linux-612-rust-185"; + patch = ./linux-612-rust-185.patch; + }; } diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index d66f9dd5c4ac..5d207580bfce 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -194,6 +194,7 @@ in { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper + kernelPatches.linux-612-rust-185 ]; };