diff options
author | Gleb Natapov <gleb@redhat.com> | 2013-10-17 16:04:47 +0200 |
---|---|---|
committer | Gleb Natapov <gleb@redhat.com> | 2013-10-17 16:41:49 +0200 |
commit | 13acfd5715144518232d8e29acf7c76ef1b089d8 (patch) | |
tree | 093c4311a737210bbdd3d1919f8193cb5f017241 /kernel/power/snapshot.c | |
parent | Merge tag 'kvm-arm-for-3.13-1' of git://git.linaro.org/people/cdall/linux-kvm... (diff) | |
parent | Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux (diff) | |
download | linux-13acfd5715144518232d8e29acf7c76ef1b089d8.tar.xz linux-13acfd5715144518232d8e29acf7c76ef1b089d8.zip |
Powerpc KVM work is based on a commit after rc4.
Merging master into next to satisfy the dependencies.
Conflicts:
arch/arm/kvm/reset.c
Diffstat (limited to 'kernel/power/snapshot.c')
-rw-r--r-- | kernel/power/snapshot.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c index 358a146fd4da..98c3b34a4cff 100644 --- a/kernel/power/snapshot.c +++ b/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) |