diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index d74f489510aa..a55b22a67790 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1445,7 +1445,7 @@ config PAGE_OFFSET default PHYS_OFFSET if !MMU default 0x40000000 if VMSPLIT_1G default 0x80000000 if VMSPLIT_2G - default 0xB8000000 if VMSPLIT_3G_OPT + default 0xB0000000 if VMSPLIT_3G_OPT default 0xD0000000 if AMLOGIC_KASAN32 default 0xC0000000 diff --git a/arch/arm/configs/meson64_a32_defconfig b/arch/arm/configs/meson64_a32_defconfig index 365651d521cc..fe16d1abedfe 100644 --- a/arch/arm/configs/meson64_a32_defconfig +++ b/arch/arm/configs/meson64_a32_defconfig @@ -43,7 +43,6 @@ CONFIG_PCI=y CONFIG_PCIE_DW_PLAT=y CONFIG_SMP=y CONFIG_SCHED_MC=y -CONFIG_VMSPLIT_3G_OPT=y CONFIG_NR_CPUS=8 CONFIG_PREEMPT=y CONFIG_HZ_250=y diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 8b20f8b38341..c7e41d4e11e7 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -1129,13 +1129,8 @@ void __init debug_ll_io_init(void) #endif #ifndef CONFIG_AMLOGIC_KASAN32 -#ifdef CONFIG_AMLOGIC_MODIFY -static void * __initdata vmalloc_min = - (void *)(VMALLOC_END - (368 << 20) - VMALLOC_OFFSET); -#else static void * __initdata vmalloc_min = (void *)(VMALLOC_END - (240 << 20) - VMALLOC_OFFSET); -#endif /* * vmalloc=size forces the vmalloc area to be exactly 'size'