Merge "mm: fix the page_owner initializing issue for arm32" (7d1bc997) · Commits · e / devices / android_kernel_oneplus_sm7250

include/linux/page_ext.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -44,8 +44,12 @@ static inline void page_ext_init_flatmem(void)
		{
		}
		extern void page_ext_init(void);
		static inline void page_ext_init_flatmem_late(void)
		{
		}
		#else
		extern void page_ext_init_flatmem(void);
		extern void page_ext_init_flatmem_late(void);
		static inline void page_ext_init(void)
		{
		}
		@@ -69,6 +73,10 @@ static inline void page_ext_init(void)
		{
		}

		static inline void page_ext_init_flatmem_late(void)
		{
		}

		static inline void page_ext_init_flatmem(void)
		{
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -541,6 +541,8 @@ static void __init mm_init(void)
		page_ext_init_flatmem();
		report_meminit();
		mem_init();
		/* page_owner must be initialized after buddy is ready */
		page_ext_init_flatmem_late();
		kmem_cache_init();
		pgtable_init();
		vmalloc_init();

+7 −1

Original line number	Diff line number	Diff line
		@@ -102,6 +102,13 @@ static void __init invoke_init_callbacks(void)
		}
		}

		#if !defined(CONFIG_SPARSEMEM)
		void __init page_ext_init_flatmem_late(void)
		{
		invoke_init_callbacks();
		}
		#endif

		static unsigned long get_entry_size(void)
		{
		return sizeof(struct page_ext) + extra_mem;
		@@ -185,7 +192,6 @@ void __init page_ext_init_flatmem(void)
		goto fail;
		}
		pr_info("allocated %ld bytes of page_ext\n", total_usage);
		invoke_init_callbacks();
		return;

		fail: