diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-17 00:49:34 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-17 00:49:34 +0300 |
| commit | 162f73f4b974aa08ab37e9d59f0428edfa8dbc51 (patch) | |
| tree | df617c4f38690d9eabfbff1e22ee659d856cb6a0 /mm/memory-failure.c | |
| parent | 5ac447d268601f88264ad18a13e7177a455007bb (diff) | |
| parent | d7143e31259cb029e207619209b31aa7520f8e28 (diff) | |
| download | linux-162f73f4b974aa08ab37e9d59f0428edfa8dbc51.tar.xz | |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"5 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
mm: correct the comment when reclaimed pages exceed the scanned pages
userfaultfd: shmem: handle coredumping in handle_userfault()
mm: numa: avoid waiting on freed migrated pages
swap: cond_resched in swap_cgroup_prepare()
mm/memory-failure.c: use compound_head() flags for huge pages
Diffstat (limited to 'mm/memory-failure.c')
| -rw-r--r-- | mm/memory-failure.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 342fac9ba89b..ecc183fd94f3 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1184,7 +1184,10 @@ int memory_failure(unsigned long pfn, int trapno, int flags) * page_remove_rmap() in try_to_unmap_one(). So to determine page status * correctly, we save a copy of the page flags at this time. */ - page_flags = p->flags; + if (PageHuge(p)) + page_flags = hpage->flags; + else + page_flags = p->flags; /* * unpoison always clear PG_hwpoison inside page lock |