diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-06-05 22:25:01 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-06-05 22:25:01 +0200 |
| commit | 9f61f62544747db5d5c590bfae9dd19f1337e421 (patch) | |
| tree | 74772cccd14e7ab6d01a3452d4030cd7f8e58ccb /mm/page_isolation.c | |
| parent | de8d1810fda5463ee60ba2937ca68e55a52bd9e7 (diff) | |
| parent | 086e8ddb567951513a5dace21a09297768aee14f (diff) | |
| download | linux-9f61f62544747db5d5c590bfae9dd19f1337e421.tar.bz2 | |
Merge branch 'linus' into irq/core
Get the urgent fixes from upstream to avoid conflicts.
Diffstat (limited to 'mm/page_isolation.c')
| -rw-r--r-- | mm/page_isolation.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/page_isolation.c b/mm/page_isolation.c index 755a42c76eb4..303c908790ef 100644 --- a/mm/page_isolation.c +++ b/mm/page_isolation.c @@ -101,7 +101,8 @@ void unset_migratetype_isolate(struct page *page, unsigned migratetype) buddy_idx = __find_buddy_index(page_idx, order); buddy = page + (buddy_idx - page_idx); - if (!is_migrate_isolate_page(buddy)) { + if (pfn_valid_within(page_to_pfn(buddy)) && + !is_migrate_isolate_page(buddy)) { __isolate_free_page(page, order); kernel_map_pages(page, (1 << order), 1); set_page_refcounted(page); |