diff options
| author | Chris Zankel <chris@zankel.net> | 2014-11-10 09:05:43 +0100 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2014-11-10 09:05:43 +0100 |
| commit | aeb589734251aaf4c28d80d0efb5da01dc0ce868 (patch) | |
| tree | ea1ee0a54d4c24221a1e80cd07e899f8b34a6920 /mm/balloon_compaction.c | |
| parent | Merge tag 'xtensa-for-next-20141021-1' of git://github.com/jcmvbkbc/linux-xte... (diff) | |
| parent | Linux 3.18-rc4 (diff) | |
| download | linux-aeb589734251aaf4c28d80d0efb5da01dc0ce868.tar.xz linux-aeb589734251aaf4c28d80d0efb5da01dc0ce868.zip | |
Merge tag 'v3.18-rc4' into for_next
Linux 3.18-rc4
Diffstat (limited to 'mm/balloon_compaction.c')
| -rw-r--r-- | mm/balloon_compaction.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/balloon_compaction.c b/mm/balloon_compaction.c index b3cbe19f71b5..fcad8322ef36 100644 --- a/mm/balloon_compaction.c +++ b/mm/balloon_compaction.c @@ -68,11 +68,13 @@ struct page *balloon_page_dequeue(struct balloon_dev_info *b_dev_info) * to be released by the balloon driver. */ if (trylock_page(page)) { +#ifdef CONFIG_BALLOON_COMPACTION if (!PagePrivate(page)) { /* raced with isolation */ unlock_page(page); continue; } +#endif spin_lock_irqsave(&b_dev_info->pages_lock, flags); balloon_page_delete(page); __count_vm_event(BALLOON_DEFLATE); |