mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-17 22:05:08 +00:00
powerpc/32: Remove __map_without_ltlbs
__map_without_ltlbs is used only for 40x, and only when STRICT_KERNEL_RWX, KFENCE or DEBUG_PAGEALLOC is active. Do the verification directly in 40x version of mmu_mapin_ram() and remove __map_without_ltlbs from core ppc32. Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/3422094db965d218c4c3d8580f526963a9ac897f.1655202721.git.christophe.leroy@csgroup.eu
This commit is contained in:
parent
56e54b4e6c
commit
513f5bbac7
@ -69,29 +69,9 @@ EXPORT_SYMBOL(agp_special_page);
|
||||
|
||||
void MMU_init(void);
|
||||
|
||||
int __map_without_ltlbs;
|
||||
|
||||
/* max amount of low RAM to map in */
|
||||
unsigned long __max_low_memory = MAX_LOW_MEM;
|
||||
|
||||
/*
|
||||
* Check for command-line options that affect what MMU_init will do.
|
||||
*/
|
||||
static void __init MMU_setup(void)
|
||||
{
|
||||
if (IS_ENABLED(CONFIG_PPC_8xx))
|
||||
return;
|
||||
|
||||
if (IS_ENABLED(CONFIG_KFENCE))
|
||||
__map_without_ltlbs = 1;
|
||||
|
||||
if (debug_pagealloc_enabled())
|
||||
__map_without_ltlbs = 1;
|
||||
|
||||
if (strict_kernel_rwx_enabled())
|
||||
__map_without_ltlbs = 1;
|
||||
}
|
||||
|
||||
/*
|
||||
* MMU_init sets up the basic memory mappings for the kernel,
|
||||
* including both RAM and possibly some I/O regions,
|
||||
@ -102,9 +82,6 @@ void __init MMU_init(void)
|
||||
if (ppc_md.progress)
|
||||
ppc_md.progress("MMU:enter", 0x111);
|
||||
|
||||
/* parse args from command line */
|
||||
MMU_setup();
|
||||
|
||||
/*
|
||||
* Reserve gigantic pages for hugetlb. This MUST occur before
|
||||
* lowmem_end_addr is initialized below.
|
||||
|
@ -43,7 +43,6 @@
|
||||
|
||||
#include <mm/mmu_decl.h>
|
||||
|
||||
extern int __map_without_ltlbs;
|
||||
/*
|
||||
* MMU_init_hw does the chip-specific initialization of the MMU hardware.
|
||||
*/
|
||||
@ -94,7 +93,13 @@ unsigned long __init mmu_mapin_ram(unsigned long base, unsigned long top)
|
||||
p = 0;
|
||||
s = total_lowmem;
|
||||
|
||||
if (__map_without_ltlbs)
|
||||
if (IS_ENABLED(CONFIG_KFENCE))
|
||||
return 0;
|
||||
|
||||
if (debug_pagealloc_enabled())
|
||||
return 0;
|
||||
|
||||
if (strict_kernel_rwx_enabled())
|
||||
return 0;
|
||||
|
||||
while (s >= LARGE_PAGE_SIZE_16M) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user