Commit af5304a7 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/code-patching: Remove init_mem_is_free 



A new state has been added by commit d2635f20 ("mm: create a new
system state and fix core_kernel_text()"). That state tells when
initmem is about to be released and is redundant with init_mem_is_free.

Remove init_mem_is_free.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/ad8c3ccb39c8edaa89fd3eda1cc7218baea1cde5.1638446239.git.christophe.leroy@csgroup.eu
parent edecd2d6

arch/powerpc/include/asm/setup.h

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ extern void ppc_printk_progress(char *s, unsigned short hex); 


extern unsigned int rtas_data;

extern unsigned long long memory_limit;

extern bool init_mem_is_free;

extern void *zalloc_maybe_bootmem(size_t size, gfp_t mask);



struct device_node;

arch/powerpc/lib/code-patching.c

+1 −2
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <asm/tlbflush.h>

#include <asm/page.h>

#include <asm/code-patching.h>

#include <asm/setup.h>

#include <asm/inst.h>



static int __patch_instruction(u32 *exec_addr, ppc_inst_t instr, u32 *patch_addr)
@@ -187,7 +186,7 @@ static int do_patch_instruction(u32 *addr, ppc_inst_t instr) 
int patch_instruction(u32 *addr, ppc_inst_t instr)

{

	/* Make sure we aren't patching a freed init section */

	if (init_mem_is_free && init_section_contains(addr, 4))

	if (system_state >= SYSTEM_FREEING_INITMEM && init_section_contains(addr, 4))

		return 0;



	return do_patch_instruction(addr, instr);

arch/powerpc/mm/mem.c

+0 −2
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <mm/mmu_decl.h>



unsigned long long memory_limit;

bool init_mem_is_free;



unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)] __page_aligned_bss;

EXPORT_SYMBOL(empty_zero_page);
@@ -312,7 +311,6 @@ void free_initmem(void) 
{

	ppc_md.progress = ppc_printk_progress;

	mark_initmem_nx();

	init_mem_is_free = true;

	free_initmem_default(POISON_FREE_INITMEM);

}