Commit 32b0c410 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm-5.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull power management fixes from Rafael Wysocki:
 "These fix a deadlock in the 'kexec jump' code and address a possible
  hibernation image creation issue.

  Specifics:

   - Fix a deadlock caused by attempting to acquire the same mutex twice
     in a row in the "kexec jump" code (Baoquan He)

   - Modify the hibernation image saving code to flush the unwritten
     data to the swap storage later so as to avoid failing to write the
     image signature which is possible in some cases (Laurent Badel)"

* tag 'pm-5.11-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM: hibernate: flush swap writer after marking
  kernel: kexec: remove the lock operation of system_transition_mutex
parents 016decc0 fef9c8d2

kernel/kexec_core.c

+0 −2
Original line number Diff line number Diff line
@@ -1134,7 +1134,6 @@ int kernel_kexec(void) 


#ifdef CONFIG_KEXEC_JUMP

	if (kexec_image->preserve_context) {

		lock_system_sleep();

		pm_prepare_console();

		error = freeze_processes();

		if (error) {
@@ -1197,7 +1196,6 @@ int kernel_kexec(void) 
		thaw_processes();

 Restore_console:

		pm_restore_console();

		unlock_system_sleep();

	}

#endif

kernel/power/swap.c

+1 −1
Original line number Diff line number Diff line
@@ -497,10 +497,10 @@ static int swap_writer_finish(struct swap_map_handle *handle, 
		unsigned int flags, int error)

{

	if (!error) {

		flush_swap_writer(handle);

		pr_info("S");

		error = mark_swapfiles(handle, flags);

		pr_cont("|\n");

		flush_swap_writer(handle);

	}



	if (error)