Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b38f67c4 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-sleep' 

* pm-sleep:
  PM / Hibernate: Do not crash kernel in free_basic_memory_bitmaps()
parents 9bad5845 6a0c7cd3

kernel/power/snapshot.c

+2 −1
Original line number Diff line number Diff line
@@ -792,7 +792,8 @@ void free_basic_memory_bitmaps(void) 
{

	struct memory_bitmap *bm1, *bm2;



	BUG_ON(!(forbidden_pages_map && free_pages_map));

	if (WARN_ON(!(forbidden_pages_map && free_pages_map)))

		return;



	bm1 = forbidden_pages_map;

	bm2 = free_pages_map;

kernel/power/user.c

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ static int snapshot_open(struct inode *inode, struct file *filp) 
		data->swap = swsusp_resume_device ?

			swap_type_of(swsusp_resume_device, 0, NULL) : -1;

		data->mode = O_RDONLY;

		data->free_bitmaps = false;

		error = pm_notifier_call_chain(PM_HIBERNATION_PREPARE);

		if (error)

			pm_notifier_call_chain(PM_POST_HIBERNATION);