Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0cd15165 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mm: fix the page_owner initializing issue for arm32"

parents ba18f05c 7f35a122

include/linux/page_ext.h

+8 −0
Original line number Diff line number Diff line
@@ -47,8 +47,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)

{

}
@@ -79,6 +83,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)

{

}

init/main.c

+2 −0
Original line number Diff line number Diff line
@@ -558,6 +558,8 @@ static void __init mm_init(void) 
	init_debug_pagealloc();

	report_meminit();

	mem_init();

	/* page_owner must be initialized after buddy is ready */

	page_ext_init_flatmem_late();

	kmem_cache_init();

	kmemleak_init();

	pgtable_init();

mm/page_ext.c

+7 −1
Original line number Diff line number Diff line
@@ -99,6 +99,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 inline struct page_ext *get_entry(void *base, unsigned long index)

{

	return base + page_ext_size * index;
@@ -177,7 +184,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: