xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

parisc: Drop __init from map_pages declaration

Browse Source 
commit 9129886b88185962538180625ca8051362b01327 upstream.

With huge kernel pages, we randomly eat a SPARC in map_pages(). This
is fixed by dropping __init from the declaration.

However, map_pages references the __init routine memblock_alloc_try_nid
via memblock_alloc.  Thus, it needs to be marked with __ref.

memblock_alloc is only called before the kernel text is set to readonly.

The __ref on free_initmem is no longer needed.

Comment regarding map_pages being in the init section is removed.

Signed-off-by: John David Anglin <dave.anglin@bell.net>
Cc: stable@vger.kernel.org # v5.4+
Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
John David Anglin
2022-01-22 18:19:49 +00:00
committed by Greg Kroah-Hartman
parent 8e3f9a098e
commit 4d569b959e
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/parisc/mm/init.c
View File

@@ -346,7 +346,7 @@ static void __init setup_bootmem(void)
static bool kernel_set_to_readonly; static bool kernel_set_to_readonly;
static void __init map_pages(unsigned long start_vaddr, static void __ref map_pages(unsigned long start_vaddr,
unsigned long start_paddr, unsigned long size, unsigned long start_paddr, unsigned long size,
pgprot_t pgprot, int force) pgprot_t pgprot, int force)
{ {
@@ -458,7 +458,7 @@ void __init set_kernel_text_rw(int enable_read_write)
flush_tlb_all(); flush_tlb_all();
} }
void __ref free_initmem(void) void free_initmem(void)
{ {
unsigned long init_begin = (unsigned long)__init_begin; unsigned long init_begin = (unsigned long)__init_begin;
unsigned long init_end = (unsigned long)__init_end; unsigned long init_end = (unsigned long)__init_end;
@@ -472,7 +472,6 @@ void __ref free_initmem(void)
/* The init text pages are marked R-X. We have to /* The init text pages are marked R-X. We have to
* flush the icache and mark them RW- * flush the icache and mark them RW-
* *
* This is tricky, because map_pages is in the init section.
* Do a dummy remap of the data section first (the data * Do a dummy remap of the data section first (the data
* section is already PAGE_KERNEL) to pull in the TLB entries * section is already PAGE_KERNEL) to pull in the TLB entries
* for map_kernel */ * for map_kernel */