The patch titled Subject: Documentation/filesystems/proc.txt: give additional comment about hugetlb usage has been removed from the -mm tree. Its filename was mm-hugetlb-proc-add-hugetlbpages-field-to-proc-pid-smaps-fix.patch This patch was dropped because it was folded into mm-hugetlb-proc-add-hugetlbpages-field-to-proc-pid-smaps.patch ------------------------------------------------------ From: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx> Subject: Documentation/filesystems/proc.txt: give additional comment about hugetlb usage Cc: Michal Hocko <mhocko@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- Documentation/filesystems/proc.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff -puN Documentation/filesystems/proc.txt~mm-hugetlb-proc-add-hugetlbpages-field-to-proc-pid-smaps-fix Documentation/filesystems/proc.txt --- a/Documentation/filesystems/proc.txt~mm-hugetlb-proc-add-hugetlbpages-field-to-proc-pid-smaps-fix +++ a/Documentation/filesystems/proc.txt @@ -457,7 +457,8 @@ anonymous copy. "AnonHugePages" shows the ammount of memory backed by transparent hugepage. -"HugetlbPages" shows the ammount of memory backed by hugetlbfs page. +"HugetlbPages" shows the ammount of memory backed by hugetlbfs page (which is +not counted in "Rss" or "Pss" field for historical reasons.) "Swap" shows how much would-be-anonymous memory is also used, but out on swap. SwapPss" shows proportional swap share of this mapping. _ Patches currently in -mm which might be from n-horiguchi@xxxxxxxxxxxxx are mm-migrate-hugetlb-putback-destination-hugepage-to-active-list.patch mm-hugetlb-proc-add-hugetlbpages-field-to-proc-pid-smaps.patch mm-hugetlb-proc-add-hugetlbpages-field-to-proc-pid-status.patch mm-hugetlb-proc-add-hugetlbpages-field-to-proc-pid-status-v5.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html