The patch titled
Subject: mm-hugetlb-proc-add-hugetlbpages-field-to-proc-pid-status-fix
has been removed from the -mm tree. Its filename was
mm-hugetlb-proc-add-hugetlbpages-field-to-proc-pid-status-fix.patch
This patch was dropped because it is obsolete
------------------------------------------------------
From: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx>
Subject: mm-hugetlb-proc-add-hugetlbpages-field-to-proc-pid-status-fix
Signed-off-by: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx>
Cc: Jörn Engel <joern@xxxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Cc: Mike Kravetz <mike.kravetz@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
Documentation/filesystems/proc.txt | 2 +-
mm/hugetlb.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff -puN Documentation/filesystems/proc.txt~mm-hugetlb-proc-add-hugetlbpages-field-to-proc-pid-status-fix Documentation/filesystems/proc.txt
--- a/Documentation/filesystems/proc.txt~mm-hugetlb-proc-add-hugetlbpages-field-to-proc-pid-status-fix
+++ a/Documentation/filesystems/proc.txt
@@ -174,7 +174,7 @@ read the file /proc/PID/status:
VmLib: 1412 kB
VmPTE: 20 kb
VmSwap: 0 kB
- HugetlbPages: 0 kB (0x2048kB)
+ HugetlbPages: 0 kB (0*2048kB)
Threads: 1
SigQ: 0/28578
SigPnd: 0000000000000000
diff -puN mm/hugetlb.c~mm-hugetlb-proc-add-hugetlbpages-field-to-proc-pid-status-fix mm/hugetlb.c
--- a/mm/hugetlb.c~mm-hugetlb-proc-add-hugetlbpages-field-to-proc-pid-status-fix
+++ a/mm/hugetlb.c
@@ -2807,7 +2807,7 @@ void hugetlb_report_usage(struct seq_fil
if (i > 0)
seq_puts(m, " ");
- seq_printf(m, "%ldx%dkB",
+ seq_printf(m, "%ld*%dkB",
atomic_long_read(&mm->hugetlb_usage.count[i]),
huge_page_size(&hstates[i]) >> 10);
}
_
Patches currently in -mm which might be from n-horiguchi@xxxxxxxxxxxxx are
mm-page_isolation-make-set-unset_migratetype_isolate-file-local.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
mm-hugetlb-proc-add-hugetlbpages-field-to-proc-pid-status-fix-3.patch
mm-hwpoison-introduce-num_poisoned_pages-wrappers.patch
mm-hwpoison-dont-try-to-unpoison-containment-failed-pages.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
