Skip to content

Commit

Permalink
mm: call {ptlock,pgtable}_cache_init() directly from mm_core_init()
Browse files Browse the repository at this point in the history
and drop pgtable_init() as it has no real value and its name is
misleading.

Link: https://lkml.kernel.org/r/20230321170513.2401534-9-rppt@kernel.org
Signed-off-by: Mike Rapoport (IBM) <rppt@kernel.org>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Vlastimil Babka <vbabka@suse.cz>
Cc: Doug Berger <opendmb@gmail.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Sergei Shtylyov <sergei.shtylyov@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
  • Loading branch information
Mike Rapoport (IBM) authored and Andrew Morton committed Apr 6, 2023
1 parent b7ec1bf commit 4cd1e9e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
6 changes: 0 additions & 6 deletions include/linux/mm.h
Original file line number Diff line number Diff line change
Expand Up @@ -2637,12 +2637,6 @@ static inline bool ptlock_init(struct page *page) { return true; }
static inline void ptlock_free(struct page *page) {}
#endif /* USE_SPLIT_PTE_PTLOCKS */

static inline void pgtable_init(void)
{
ptlock_cache_init();
pgtable_cache_init();
}

static inline bool pgtable_pte_page_ctor(struct page *page)
{
if (!ptlock_init(page))
Expand Down
3 changes: 2 additions & 1 deletion mm/mm_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -2584,7 +2584,8 @@ void __init mm_core_init(void)
*/
page_ext_init_flatmem_late();
kmemleak_init();
pgtable_init();
ptlock_cache_init();
pgtable_cache_init();
debug_objects_mem_init();
vmalloc_init();
/* If no deferred init page_ext now, as vmap is fully initialized */
Expand Down

0 comments on commit 4cd1e9e

Please sign in to comment.