On Saturday, September 28, 2013 08:18:18 PM Ronald wrote:
> [ resend, forgot to disable HTML (sorry!) ]
>
> Dear kernel developers,
>
> Commit 8fd37a4c9 (PM / hibernate: Create memory bitmaps after freezing
> user space) causes resume to fail.
>
> Only, when using the s2disk utility (through pm-hibernate).
>
> Not when I do:
>
> echo -n "disk" > /sys/power/state
>
> Reverting the commit did not work.
>
> I am using a encrypted LUKS partition with a temporary key that is
> functioning as the swap device used for the suspend image.
>
> Awaiting further orders....
I'm traveling now, so I can't really test things, but I think I know what the
problem is.
Can you please check if the appended patch makes any difference for you?
Rafael
---
kernel/power/snapshot.c | 5 ++++-
kernel/power/user.c | 5 +++++
2 files changed, 9 insertions(+), 1 deletion(-)
Index: linux-pm/kernel/power/snapshot.c
===================================================================
--- linux-pm.orig/kernel/power/snapshot.c
+++ linux-pm/kernel/power/snapshot.c
@@ -743,7 +743,10 @@ int create_basic_memory_bitmaps(void)
struct memory_bitmap *bm1, *bm2;
int error = 0;
- BUG_ON(forbidden_pages_map || free_pages_map);
+ if (forbidden_pages_map && free_pages_map)
+ return 0;
+ else
+ BUG_ON(forbidden_pages_map || free_pages_map);
bm1 = kzalloc(sizeof(struct memory_bitmap), GFP_KERNEL);
if (!bm1)
Index: linux-pm/kernel/power/user.c
===================================================================
--- linux-pm.orig/kernel/power/user.c
+++ linux-pm/kernel/power/user.c
@@ -82,6 +82,9 @@ static int snapshot_open(struct inode *i
data->swap = -1;
data->mode = O_WRONLY;
error = pm_notifier_call_chain(PM_RESTORE_PREPARE);
+ if (!error)
+ error = create_basic_memory_bitmaps();
+
if (error)
pm_notifier_call_chain(PM_POST_RESTORE);
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
