1 diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
2 index 14428d2..f15c22e 100644
3 --- a/arch/arm/mm/mmu.c
4 +++ b/arch/arm/mm/mmu.c
5 @@ -1028,15 +1028,10 @@ void __init debug_ll_io_init(void)
6 static void * __initdata vmalloc_min =
7 (void *)(VMALLOC_END - (240 << 20) - VMALLOC_OFFSET);
9 -static bool __initdata brcmstb_did_override_vmalloc;
12 * vmalloc=size forces the vmalloc area to be exactly 'size'
13 * bytes. This can be used to increase (or decrease) the vmalloc
14 * area - the default is 240m.
16 - * NOTE: different default for BRCMSTB with >= 1GiB RAM, see
17 - * brcmstb_maybe_increase_vmalloc() below.
19 static int __init early_vmalloc(char *arg)
21 @@ -1057,35 +1052,17 @@ static int __init early_vmalloc(char *arg)
24 vmalloc_min = (void *)(VMALLOC_END - vmalloc_reserve);
25 - brcmstb_did_override_vmalloc = true;
28 early_param("vmalloc", early_vmalloc);
30 -static void __init brcmstb_maybe_increase_vmalloc(void)
32 -#ifdef CONFIG_BRCMSTB
33 - if (brcmstb_did_override_vmalloc)
35 - if (meminfo.bank[0].size >= SZ_1G || meminfo.nr_banks > 1) {
36 - vmalloc_min = (void *)(VMALLOC_END - (744 << 20) -
44 phys_addr_t arm_lowmem_limit __initdata = 0;
46 void __init sanity_check_meminfo(void)
48 phys_addr_t memblock_limit = 0;
49 int i, j, highmem = 0;
50 - phys_addr_t vmalloc_limit;
52 - brcmstb_maybe_increase_vmalloc();
53 - vmalloc_limit = __pa(vmalloc_min - 1) + 1;
54 + phys_addr_t vmalloc_limit = __pa(vmalloc_min - 1) + 1;
56 for (i = 0, j = 0; i < meminfo.nr_banks; i++) {
57 struct membank *bank = &meminfo.bank[j];