TechPanelGM/kernel_xiaomi_sm8250
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
qctecmdr
2020-09-04 04:11:02 -07:00
committed by Gerrit - the friendly Code Review server
parent fffa5df6a9 8d228fbbce
commit 7d1bc997eb
3 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/linux/page_ext.h
View File

@@ -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
init/main.c
View File

@@ -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();

8
mm/page_ext.c
View File

@@ -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: