The patch titled Subject: mm-reset-numa-stats-for-boot-pagesets-v3 has been removed from the -mm tree. Its filename was mm-reset-numa-stats-for-boot-pagesets-v3.patch This patch was dropped because it was folded into mm-reset-numa-stats-for-boot-pagesets.patch ------------------------------------------------------ From: Sandipan Das <sandipan@xxxxxxxxxxxxx> Subject: mm-reset-numa-stats-for-boot-pagesets-v3 Drop the redundant static key-based check to see if numa stats are enabled as suggested by Vlastimil. Link: http://lkml.kernel.org/r/20200511170356.162531-1-sandipan@xxxxxxxxxxxxx Signed-off-by: Sandipan Das <sandipan@xxxxxxxxxxxxx> Acked-by: Vlastimil Babka <vbabka@xxxxxxx> Cc: Konstantin Khlebnikov <khlebnikov@xxxxxxxxxxxxxx> Cc: Michal Hocko <mhocko@xxxxxxxx> Cc: "Kirill A . Shutemov" <kirill@xxxxxxxxxxxxx> Cc: "Aneesh Kumar K.V" <aneesh.kumar@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/page_alloc.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) --- a/mm/page_alloc.c~mm-reset-numa-stats-for-boot-pagesets-v3 +++ a/mm/page_alloc.c @@ -6247,26 +6247,22 @@ void __init setup_per_cpu_pageset(void) { struct pglist_data *pgdat; struct zone *zone; + int __maybe_unused cpu; for_each_populated_zone(zone) setup_zone_pageset(zone); #ifdef CONFIG_NUMA - if (static_branch_likely(&vm_numa_stat_key)) { - struct per_cpu_pageset *pcp; - int cpu; - - /* - * Unpopulated zones continue using the boot pagesets. - * The numa stats for these pagesets need to be reset. - * Otherwise, they will end up skewing the stats of - * the nodes these zones are associated with. - */ - for_each_possible_cpu(cpu) { - pcp = &per_cpu(boot_pageset, cpu); - memset(pcp->vm_numa_stat_diff, 0, - sizeof(pcp->vm_numa_stat_diff)); - } + /* + * Unpopulated zones continue using the boot pagesets. + * The numa stats for these pagesets need to be reset. + * Otherwise, they will end up skewing the stats of + * the nodes these zones are associated with. + */ + for_each_possible_cpu(cpu) { + struct per_cpu_pageset *pcp = &per_cpu(boot_pageset, cpu); + memset(pcp->vm_numa_stat_diff, 0, + sizeof(pcp->vm_numa_stat_diff)); } #endif _ Patches currently in -mm which might be from sandipan@xxxxxxxxxxxxx are mm-reset-numa-stats-for-boot-pagesets.patch selftests-vm-pkeys-use-sane-types-for-pkey-register.patch selftests-vm-pkeys-add-helpers-for-pkey-bits.patch selftests-vm-pkeys-use-the-correct-huge-page-size.patch selftests-vm-pkeys-introduce-powerpc-support-fix.patch selftests-vm-pkeys-override-access-right-definitions-on-powerpc-fix.patch selftests-vm-pkeys-use-the-correct-page-size-on-powerpc.patch selftests-vm-pkeys-fix-multilib-builds-for-x86.patch