From: Christophe Leroy christophe.leroy@csgroup.eu
[ Upstream commit e012a25d81a12fb332e862b51bfb59321acf96e4 ]
The generic version of arch_is_kernel_initmem_freed() now does the same as powerpc version.
Remove the powerpc version.
Link: https://lkml.kernel.org/r/c53764eb45d41491e2b21da2e7812239897dbebb.163300101... Signed-off-by: Christophe Leroy christophe.leroy@csgroup.eu Cc: Kefeng Wang wangkefeng.wang@huawei.com Cc: Benjamin Herrenschmidt benh@kernel.crashing.org Cc: Gerald Schaefer gerald.schaefer@linux.ibm.com Cc: Heiko Carstens hca@linux.ibm.com Cc: Paul Mackerras paulus@ozlabs.org Signed-off-by: Andrew Morton akpm@linux-foundation.org Signed-off-by: Linus Torvalds torvalds@linux-foundation.org Stable-dep-of: 111bcb373853 ("powerpc/64s/radix: Fix RWX mapping with relocated kernel") Signed-off-by: Sasha Levin sashal@kernel.org --- arch/powerpc/include/asm/sections.h | 13 ------------- 1 file changed, 13 deletions(-)
diff --git a/arch/powerpc/include/asm/sections.h b/arch/powerpc/include/asm/sections.h index 6e4af4492a144..79cb7a25a5fb6 100644 --- a/arch/powerpc/include/asm/sections.h +++ b/arch/powerpc/include/asm/sections.h @@ -6,21 +6,8 @@ #include <linux/elf.h> #include <linux/uaccess.h>
-#define arch_is_kernel_initmem_freed arch_is_kernel_initmem_freed - #include <asm-generic/sections.h>
-extern bool init_mem_is_free; - -static inline int arch_is_kernel_initmem_freed(unsigned long addr) -{ - if (!init_mem_is_free) - return 0; - - return addr >= (unsigned long)__init_begin && - addr < (unsigned long)__init_end; -} - extern char __head_end[];
#ifdef __powerpc64__