projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'pm-sleep'
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
power
/
snapshot.c
diff --git
a/kernel/power/snapshot.c
b/kernel/power/snapshot.c
index 10c22cae83a035e43eb54a79272fd1e6ae2fc757..b38109e204aff8e83afb0e15484cdfec8e450575 100644
(file)
--- a/
kernel/power/snapshot.c
+++ b/
kernel/power/snapshot.c
@@
-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;