Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b12909f authored by Chris Metcalf's avatar Chris Metcalf
Browse files

tile: remove HUGE_VMAP dead code 



A config option to allow a variant vmap() using huge pages that was never
upstreamed had some bits of code related to it scattered around the tile
architecture; the config option was removed downstream and this commit
cleans up the scattered evidence of it from the upstream as well.

Signed-off-by: default avatarChris Metcalf <cmetcalf@tilera.com>
parent 8629470e

arch/tile/include/asm/page.h

+2 −3
Original line number Diff line number Diff line
@@ -182,10 +182,9 @@ static inline __attribute_const__ int get_order(unsigned long size) 


#define PAGE_OFFSET		(-(_AC(1, UL) << (MAX_VA_WIDTH - 1)))

#define KERNEL_HIGH_VADDR	_AC(0xfffffff800000000, UL)  /* high 32GB */

#define FIXADDR_BASE		(KERNEL_HIGH_VADDR - 0x400000000) /* 4 GB */

#define FIXADDR_TOP		(KERNEL_HIGH_VADDR - 0x300000000) /* 4 GB */

#define FIXADDR_BASE		(KERNEL_HIGH_VADDR - 0x300000000) /* 4 GB */

#define FIXADDR_TOP		(KERNEL_HIGH_VADDR - 0x200000000) /* 4 GB */

#define _VMALLOC_START		FIXADDR_TOP

#define HUGE_VMAP_BASE		(KERNEL_HIGH_VADDR - 0x200000000) /* 4 GB */

#define MEM_SV_START		(KERNEL_HIGH_VADDR - 0x100000000) /* 256 MB */

#define MEM_MODULE_START	(MEM_SV_START + (256*1024*1024)) /* 256 MB */

#define MEM_MODULE_END		(MEM_MODULE_START + (256*1024*1024))

arch/tile/include/asm/pgtable_32.h

+2 −10
Original line number Diff line number Diff line
@@ -55,17 +55,9 @@ 
#define PKMAP_BASE   ((FIXADDR_BOOT_START - PAGE_SIZE*LAST_PKMAP) & PGDIR_MASK)



#ifdef CONFIG_HIGHMEM

# define __VMAPPING_END	(PKMAP_BASE & ~(HPAGE_SIZE-1))

# define _VMALLOC_END	(PKMAP_BASE & ~(HPAGE_SIZE-1))

#else

# define __VMAPPING_END	(FIXADDR_START & ~(HPAGE_SIZE-1))

#endif



#ifdef CONFIG_HUGEVMAP

#define HUGE_VMAP_END	__VMAPPING_END

#define HUGE_VMAP_BASE	(HUGE_VMAP_END - CONFIG_NR_HUGE_VMAPS * HPAGE_SIZE)

#define _VMALLOC_END	HUGE_VMAP_BASE

#else

#define _VMALLOC_END	__VMAPPING_END

# define _VMALLOC_END	(FIXADDR_START & ~(HPAGE_SIZE-1))

#endif



/*

arch/tile/include/asm/pgtable_64.h

+1 −3
Original line number Diff line number Diff line
@@ -52,12 +52,10 @@ 
 * memory allocation code).  The vmalloc code puts in an internal

 * guard page between each allocation.

 */

#define _VMALLOC_END	HUGE_VMAP_BASE

#define _VMALLOC_END	MEM_SV_START

#define VMALLOC_END	_VMALLOC_END

#define VMALLOC_START	_VMALLOC_START



#define HUGE_VMAP_END	(HUGE_VMAP_BASE + PGDIR_SIZE)



#ifndef __ASSEMBLY__



/* We have no pud since we are a three-level page table. */

arch/tile/kernel/setup.c

+1 −2
Original line number Diff line number Diff line
@@ -1268,8 +1268,7 @@ static void __init validate_va(void) 
	if ((long)VMALLOC_START >= 0)

		early_panic(

			"Linux VMALLOC region below the 2GB line (%#lx)!\n"

			"Reconfigure the kernel with fewer NR_HUGE_VMAPS\n"

			"or smaller VMALLOC_RESERVE.\n",

			"Reconfigure the kernel with smaller VMALLOC_RESERVE.\n",

			VMALLOC_START);

#endif

}

arch/tile/mm/fault.c

+0 −2
Original line number Diff line number Diff line
@@ -149,8 +149,6 @@ static inline int vmalloc_fault(pgd_t *pgd, unsigned long address) 
	pmd_k = vmalloc_sync_one(pgd, address);

	if (!pmd_k)

		return -1;

	if (pmd_huge(*pmd_k))

		return 0;   /* support TILE huge_vmap() API */

	pte_k = pte_offset_kernel(pmd_k, address);

	if (!pte_present(*pte_k))

		return -1;