The patch titled
mm-add-vm-counters-for-transparent-hugepages-fix
has been removed from the -mm tree. Its filename was
mm-add-vm-counters-for-transparent-hugepages-fix.patch
This patch was dropped because it was folded into mm-add-vm-counters-for-transparent-hugepages.patch
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: mm-add-vm-counters-for-transparent-hugepages-fix
From: Johannes Weiner <hannes@xxxxxxxxxxx>
On Fri, Mar 04, 2011 at 04:08:30PM -0800, akpm@xxxxxxxxxxxxxxxxxxxx wrote:
> diff -puN mm/vmstat.c~mm-add-vm-counters-for-transparent-hugepages mm/vmstat.c
> --- a/mm/vmstat.c~mm-add-vm-counters-for-transparent-hugepages
> +++ a/mm/vmstat.c
> @@ -946,6 +946,14 @@ static const char * const vmstat_text[]
> "unevictable_pgs_stranded",
> "unevictable_pgs_mlockfreed",
> #endif
> +
> +#ifdef CONFIG_TRANSPARENT_HUGEPAGE
> + "thp_fault_alloc",
> + "thp_fault_fallback",
> + "thp_collapse_alloc",
> + "thp_collapse_alloc_failed",
> + "thp_split",
> +#endif
> };
This first #endif in this hunk does not belong to the unevictable
counters, as one could be easily trapped into assuming, it's the
higher level 'vm event counters enabled'. The thp event name strings
should be part of that block as well.
Since there are no zone stat items after the event counters, the only
misbehaviour for now would be having those strings defined on a THP &&
!VM_EVENT_COUNTERS config.
Signed-off-by: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxxxxxxxxxx>
Cc: Andrea Arcangeli <aarcange@xxxxxxxxxx>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/vmstat.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff -puN mm/vmstat.c~mm-add-vm-counters-for-transparent-hugepages-fix mm/vmstat.c
--- a/mm/vmstat.c~mm-add-vm-counters-for-transparent-hugepages-fix
+++ a/mm/vmstat.c
@@ -951,7 +951,6 @@ static const char * const vmstat_text[]
"unevictable_pgs_cleared",
"unevictable_pgs_stranded",
"unevictable_pgs_mlockfreed",
-#endif
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
"thp_fault_alloc",
@@ -960,6 +959,8 @@ static const char * const vmstat_text[]
"thp_collapse_alloc_failed",
"thp_split",
#endif
+
+#endif /* CONFIG_VM_EVENTS_COUNTERS */
};
static void zoneinfo_show_print(struct seq_file *m, pg_data_t *pgdat,
_
Patches currently in -mm which might be from hannes@xxxxxxxxxxx are
memcg-fix-mem_cgroup_rotate_reclaimable_page.patch
ksm-add-vm_stat-and-meminfo-entry-to-reflect-pte-mapping-to-ksm-pages-fix-fix-fix-fix.patch
mm-add-vm-counters-for-transparent-hugepages.patch
mm-batch-activate_page-to-reduce-lock-contention.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
