Merge tag 'mm-stable-2022-10-13' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / mm / page_alloc.c

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 8e9b7f08a32ce8d09e1dcbf397118c52d29dfabd..e20ade858e71c80f857f8044477cd4918c336258 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -6102,7 +6102,8 @@ void __show_free_areas(unsigned int filter, nodemask_t *nodemask, int max_zone_i
                " active_file:%lu inactive_file:%lu isolated_file:%lu\n"
                " unevictable:%lu dirty:%lu writeback:%lu\n"
                " slab_reclaimable:%lu slab_unreclaimable:%lu\n"
-               " mapped:%lu shmem:%lu pagetables:%lu bounce:%lu\n"
+               " mapped:%lu shmem:%lu pagetables:%lu\n"
+               " sec_pagetables:%lu bounce:%lu\n"
                " kernel_misc_reclaimable:%lu\n"
                " free:%lu free_pcp:%lu free_cma:%lu\n",
                global_node_page_state(NR_ACTIVE_ANON),
@@ -6119,6 +6120,7 @@ void __show_free_areas(unsigned int filter, nodemask_t *nodemask, int max_zone_i
                global_node_page_state(NR_FILE_MAPPED),
                global_node_page_state(NR_SHMEM),
                global_node_page_state(NR_PAGETABLE),
+               global_node_page_state(NR_SECONDARY_PAGETABLE),
                global_zone_page_state(NR_BOUNCE),
                global_node_page_state(NR_KERNEL_MISC_RECLAIMABLE),
                global_zone_page_state(NR_FREE_PAGES),
@@ -6154,6 +6156,7 @@ void __show_free_areas(unsigned int filter, nodemask_t *nodemask, int max_zone_i
                        " shadow_call_stack:%lukB"
 #endif
                        " pagetables:%lukB"
+                       " sec_pagetables:%lukB"
                        " all_unreclaimable? %s"
                        "\n",
                        pgdat->node_id,
@@ -6179,6 +6182,7 @@ void __show_free_areas(unsigned int filter, nodemask_t *nodemask, int max_zone_i
                        node_page_state(pgdat, NR_KERNEL_SCS_KB),
 #endif
                        K(node_page_state(pgdat, NR_PAGETABLE)),
+                       K(node_page_state(pgdat, NR_SECONDARY_PAGETABLE)),
                        pgdat->kswapd_failures >= MAX_RECLAIM_RETRIES ?
                                "yes" : "no");
        }