Commit 564f6ea1 authored by Christophe Leroy's avatar Christophe Leroy Committed by Linus Torvalds
Browse files

s390: use generic version of arch_is_kernel_initmem_freed() 

The generic version of arch_is_kernel_initmem_freed() now does the same
as s390 version.

Remove the s390 version.

Link: https://lkml.kernel.org/r/b6feb5dfe611a322de482762fc2df3a9eece70c7.1633001016.git.christophe.leroy@csgroup.eu


Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Acked-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Cc: Gerald Schaefer <gerald.schaefer@linux.ibm.com>
Cc: Kefeng Wang <wangkefeng.wang@huawei.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@ozlabs.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e012a25d

arch/s390/include/asm/sections.h

+0 −12
Original line number Diff line number Diff line
@@ -2,20 +2,8 @@ 
#ifndef _S390_SECTIONS_H

#define _S390_SECTIONS_H



#define arch_is_kernel_initmem_freed arch_is_kernel_initmem_freed



#include <asm-generic/sections.h>



extern bool initmem_freed;



static inline int arch_is_kernel_initmem_freed(unsigned long addr)

{

	if (!initmem_freed)

		return 0;

	return addr >= (unsigned long)__init_begin &&

	       addr < (unsigned long)__init_end;

}



/*

 * .boot.data section contains variables "shared" between the decompressor and

 * the decompressed kernel. The decompressor will store values in them, and

arch/s390/mm/init.c

+0 −3
Original line number Diff line number Diff line
@@ -58,8 +58,6 @@ unsigned long empty_zero_page, zero_page_mask; 
EXPORT_SYMBOL(empty_zero_page);

EXPORT_SYMBOL(zero_page_mask);



bool initmem_freed;



static void __init setup_zero_pages(void)

{

	unsigned int order;
@@ -214,7 +212,6 @@ void __init mem_init(void) 


void free_initmem(void)

{

	initmem_freed = true;

	__set_memory((unsigned long)_sinittext,

		     (unsigned long)(_einittext - _sinittext) >> PAGE_SHIFT,

		     SET_MEMORY_RW | SET_MEMORY_NX);