xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'robh/for-next' into devicetree/next

Browse Source
This commit is contained in:
Grant Likely
2014-03-31 08:10:55 +01:00
parent 676e1b2fcd 6f976267da
commit d88cf7d7b4
305 changed files with 2882 additions and 1687 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fs/proc/page.c
View File

@@ -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;
/*