diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-19 00:07:08 (GMT) |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-19 00:07:08 (GMT) |
| commit | b38f67c4ae35eb4bcea0bf42a0a18a778a5d04c2 (patch) | |
| tree | 16718edcebee40195a12dc01c7037b17c8f619f0 /kernel/power/snapshot.c | |
| parent | 9bad5845485ec22b31d4489c3bd6d96d78442437 (diff) | |
| parent | 6a0c7cd33075f6b7f1d80145bb19812beb3fc5c9 (diff) | |
| download | linux-b38f67c4ae35eb4bcea0bf42a0a18a778a5d04c2.tar.xz | |
Merge branch 'pm-sleep'
* pm-sleep:
PM / Hibernate: Do not crash kernel in free_basic_memory_bitmaps()
Diffstat (limited to 'kernel/power/snapshot.c')
| -rw-r--r-- | kernel/power/snapshot.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c index 10c22ca..b38109e 100644 --- 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; |