From cb9f11f1840546bb7b4beb6d527e9e965aaf27f3 Mon Sep 17 00:00:00 2001 From: chn Date: Tue, 2 Dec 2025 14:48:54 +0800 Subject: [PATCH] modules.system.kernel: drop hibernate-progress patch --- modules/system/fileSystems/default.nix | 1 - .../system/{kernel/default.nix => kernel.nix} | 1 - .../system/kernel/hibernate-progress.patch | 128 ------------------ 3 files changed, 130 deletions(-) rename modules/system/{kernel/default.nix => kernel.nix} (96%) delete mode 100644 modules/system/kernel/hibernate-progress.patch diff --git a/modules/system/fileSystems/default.nix b/modules/system/fileSystems/default.nix index 4583b03a..e8e6f975 100644 --- a/modules/system/fileSystems/default.nix +++ b/modules/system/fileSystems/default.nix @@ -88,7 +88,6 @@ inputs: resumeDevice = fileSystems.resume.device; kernelParams = [ "resume_offset=${builtins.toString fileSystems.resume.offset}" ]; }; - nixos.system.kernel.patches = [ "hibernate-progress" ]; systemd.sleep.extraConfig = "HibernateMode=reboot"; }) ]; diff --git a/modules/system/kernel/default.nix b/modules/system/kernel.nix similarity index 96% rename from modules/system/kernel/default.nix rename to modules/system/kernel.nix index 309619c8..1f002401 100644 --- a/modules/system/kernel/default.nix +++ b/modules/system/kernel.nix @@ -69,7 +69,6 @@ inputs: kernelPatches = let patches = { - hibernate-progress = [{ name = "hibernate-progress"; patch = ./hibernate-progress.patch; }]; btrfs = [{ name = "btrfs"; diff --git a/modules/system/kernel/hibernate-progress.patch b/modules/system/kernel/hibernate-progress.patch deleted file mode 100644 index 1c77688a..00000000 --- a/modules/system/kernel/hibernate-progress.patch +++ /dev/null @@ -1,128 +0,0 @@ -diff --git a/kernel/power/swap.c b/kernel/power/swap.c -index 5bc04bfe2db1..6e7b17b97de7 100644 ---- a/kernel/power/swap.c -+++ b/kernel/power/swap.c -@@ -563,7 +563,7 @@ static int save_image(struct swap_map_handle *handle, - - hib_init_batch(&hb); - -- pr_info("Saving image data pages (%u pages)...\n", -+ pr_err("Saving image data pages (%u pages)...\n", - nr_to_write); - m = nr_to_write / 10; - if (!m) -@@ -578,7 +578,7 @@ static int save_image(struct swap_map_handle *handle, - if (ret) - break; - if (!(nr_pages % m)) -- pr_info("Image saving progress: %3d%%\n", -+ pr_err("Image saving progress: %3d%%\n", - nr_pages / m * 10); - nr_pages++; - } -@@ -588,7 +588,7 @@ static int save_image(struct swap_map_handle *handle, - if (!ret) - ret = err2; - if (!ret) -- pr_info("Image saving done\n"); -+ pr_err("Image saving done\n"); - swsusp_show_speed(start, stop, nr_to_write, "Wrote"); - return ret; - } -@@ -795,8 +795,8 @@ static int save_compressed_image(struct swap_map_handle *handle, - */ - handle->reqd_free_pages = reqd_free_pages(); - -- pr_info("Using %u thread(s) for %s compression\n", nr_threads, hib_comp_algo); -- pr_info("Compressing and saving image data (%u pages)...\n", -+ pr_err("Using %u thread(s) for %s compression\n", nr_threads, hib_comp_algo); -+ pr_err("Compressing and saving image data (%u pages)...\n", - nr_to_write); - m = nr_to_write / 10; - if (!m) -@@ -817,7 +817,7 @@ static int save_compressed_image(struct swap_map_handle *handle, - data_of(*snapshot), PAGE_SIZE); - - if (!(nr_pages % m)) -- pr_info("Image saving progress: %3d%%\n", -+ pr_err("Image saving progress: %3d%%\n", - nr_pages / m * 10); - nr_pages++; - } -@@ -888,9 +888,9 @@ static int save_compressed_image(struct swap_map_handle *handle, - if (!ret) - ret = err2; - if (!ret) -- pr_info("Image saving done\n"); -+ pr_err("Image saving done\n"); - swsusp_show_speed(start, stop, nr_to_write, "Wrote"); -- pr_info("Image size after compression: %d kbytes\n", -+ pr_err("Image size after compression: %d kbytes\n", - (atomic_read(&compressed_size) / 1024)); - - out_clean: -@@ -1105,7 +1105,7 @@ static int load_image(struct swap_map_handle *handle, - hib_init_batch(&hb); - - clean_pages_on_read = true; -- pr_info("Loading image data pages (%u pages)...\n", nr_to_read); -+ pr_err("Loading image data pages (%u pages)...\n", nr_to_read); - m = nr_to_read / 10; - if (!m) - m = 1; -@@ -1123,7 +1123,7 @@ static int load_image(struct swap_map_handle *handle, - if (ret) - break; - if (!(nr_pages % m)) -- pr_info("Image loading progress: %3d%%\n", -+ pr_err("Image loading progress: %3d%%\n", - nr_pages / m * 10); - nr_pages++; - } -@@ -1133,7 +1133,7 @@ static int load_image(struct swap_map_handle *handle, - if (!ret) - ret = err2; - if (!ret) { -- pr_info("Image loading done\n"); -+ pr_err("Image loading done\n"); - ret = snapshot_write_finalize(snapshot); - if (!ret && !snapshot_image_loaded(snapshot)) - ret = -ENODATA; -@@ -1328,8 +1328,8 @@ static int load_compressed_image(struct swap_map_handle *handle, - } - want = ring_size = i; - -- pr_info("Using %u thread(s) for %s decompression\n", nr_threads, hib_comp_algo); -- pr_info("Loading and decompressing image data (%u pages)...\n", -+ pr_err("Using %u thread(s) for %s decompression\n", nr_threads, hib_comp_algo); -+ pr_err("Loading and decompressing image data (%u pages)...\n", - nr_to_read); - m = nr_to_read / 10; - if (!m) -@@ -1459,7 +1459,7 @@ static int load_compressed_image(struct swap_map_handle *handle, - data[thr].unc + off, PAGE_SIZE); - - if (!(nr_pages % m)) -- pr_info("Image loading progress: %3d%%\n", -+ pr_err("Image loading progress: %3d%%\n", - nr_pages / m * 10); - nr_pages++; - -@@ -1485,7 +1485,7 @@ static int load_compressed_image(struct swap_map_handle *handle, - } - stop = ktime_get(); - if (!ret) { -- pr_info("Image loading done\n"); -+ pr_err("Image loading done\n"); - ret = snapshot_write_finalize(snapshot); - if (!ret && !snapshot_image_loaded(snapshot)) - ret = -ENODATA; -@@ -1593,7 +1593,7 @@ int swsusp_check(bool exclusive) - } - if (!error && swsusp_header->flags & SF_HW_SIG && - swsusp_header->hw_sig != swsusp_hardware_signature) { -- pr_info("Suspend image hardware signature mismatch (%08x now %08x); aborting resume.\n", -+ pr_err("Suspend image hardware signature mismatch (%08x now %08x); aborting resume.\n", - swsusp_header->hw_sig, swsusp_hardware_signature); - error = -EINVAL; - }