diff options
| author | Grant Likely <grant.likely@linaro.org> | 2014-03-31 08:10:55 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2014-03-31 08:10:55 +0100 |
| commit | d88cf7d7b4240b8df170ba105e414e476fb51cce (patch) | |
| tree | 7efe976da6e0ec854eb0eeda82c1e9a275b8c69f /fs/proc | |
| parent | 676e1b2fcd9dbb47a59baac13d089621d22c68b8 (diff) | |
| parent | 6f976267da0e2c873c4b4aaacaf08266d1d1797d (diff) | |
| download | op-kernel-dev-d88cf7d7b4240b8df170ba105e414e476fb51cce.zip op-kernel-dev-d88cf7d7b4240b8df170ba105e414e476fb51cce.tar.gz | |
Merge remote-tracking branch 'robh/for-next' into devicetree/next
Diffstat (limited to 'fs/proc')
| -rw-r--r-- | fs/proc/page.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/proc/page.c b/fs/proc/page.c index 02174a6..e647c55 100644 --- a/fs/proc/page.c +++ b/fs/proc/page.c @@ -121,9 +121,8 @@ u64 stable_page_flags(struct page *page) * just checks PG_head/PG_tail, so we need to check PageLRU/PageAnon * to make sure a given page is a thp, not a non-huge compound page. */ - else if (PageTransCompound(page) && - (PageLRU(compound_trans_head(page)) || - PageAnon(compound_trans_head(page)))) + else if (PageTransCompound(page) && (PageLRU(compound_head(page)) || + PageAnon(compound_head(page)))) u |= 1 << KPF_THP; /* |
