Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 4b12909fd137d9a236e4b5c76e0d4b44c2b7f49f

Authored by Chris Metcalf
1 parent 8629470ef8
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

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: Chris Metcalf <cmetcalf@tilera.com>

Showing 6 changed files with 6 additions and 24 deletions Side-by-side Diff

arch/tile/include/asm/page.h
Diff comments   View file @ 4b12909
... ... @@ -182,10 +182,9 @@
182 182  
183 183 #define PAGE_OFFSET (-(_AC(1, UL) << (MAX_VA_WIDTH - 1)))
184 184 #define KERNEL_HIGH_VADDR _AC(0xfffffff800000000, UL) /* high 32GB */
185   -#define FIXADDR_BASE (KERNEL_HIGH_VADDR - 0x400000000) /* 4 GB */
186   -#define FIXADDR_TOP (KERNEL_HIGH_VADDR - 0x300000000) /* 4 GB */
  185 +#define FIXADDR_BASE (KERNEL_HIGH_VADDR - 0x300000000) /* 4 GB */
  186 +#define FIXADDR_TOP (KERNEL_HIGH_VADDR - 0x200000000) /* 4 GB */
187 187 #define _VMALLOC_START FIXADDR_TOP
188   -#define HUGE_VMAP_BASE (KERNEL_HIGH_VADDR - 0x200000000) /* 4 GB */
189 188 #define MEM_SV_START (KERNEL_HIGH_VADDR - 0x100000000) /* 256 MB */
190 189 #define MEM_MODULE_START (MEM_SV_START + (256*1024*1024)) /* 256 MB */
191 190 #define MEM_MODULE_END (MEM_MODULE_START + (256*1024*1024))
arch/tile/include/asm/pgtable_32.h
Diff comments   View file @ 4b12909
... ... @@ -55,17 +55,9 @@
55 55 #define PKMAP_BASE ((FIXADDR_BOOT_START - PAGE_SIZE*LAST_PKMAP) & PGDIR_MASK)
56 56  
57 57 #ifdef CONFIG_HIGHMEM
58   -# define __VMAPPING_END (PKMAP_BASE & ~(HPAGE_SIZE-1))
  58 +# define _VMALLOC_END (PKMAP_BASE & ~(HPAGE_SIZE-1))
59 59 #else
60   -# define __VMAPPING_END (FIXADDR_START & ~(HPAGE_SIZE-1))
61   -#endif
62   -
63   -#ifdef CONFIG_HUGEVMAP
64   -#define HUGE_VMAP_END __VMAPPING_END
65   -#define HUGE_VMAP_BASE (HUGE_VMAP_END - CONFIG_NR_HUGE_VMAPS * HPAGE_SIZE)
66   -#define _VMALLOC_END HUGE_VMAP_BASE
67   -#else
68   -#define _VMALLOC_END __VMAPPING_END
  60 +# define _VMALLOC_END (FIXADDR_START & ~(HPAGE_SIZE-1))
69 61 #endif
70 62  
71 63 /*
arch/tile/include/asm/pgtable_64.h
Diff comments   View file @ 4b12909
... ... @@ -52,11 +52,9 @@
52 52 * memory allocation code). The vmalloc code puts in an internal
53 53 * guard page between each allocation.
54 54 */
55   -#define _VMALLOC_END HUGE_VMAP_BASE
  55 +#define _VMALLOC_END MEM_SV_START
56 56 #define VMALLOC_END _VMALLOC_END
57 57 #define VMALLOC_START _VMALLOC_START
58   -
59   -#define HUGE_VMAP_END (HUGE_VMAP_BASE + PGDIR_SIZE)
60 58  
61 59 #ifndef __ASSEMBLY__
62 60  
arch/tile/kernel/setup.c
Diff comments   View file @ 4b12909
... ... @@ -1268,8 +1268,7 @@
1268 1268 if ((long)VMALLOC_START >= 0)
1269 1269 early_panic(
1270 1270 "Linux VMALLOC region below the 2GB line (%#lx)!\n"
1271   - "Reconfigure the kernel with fewer NR_HUGE_VMAPS\n"
1272   - "or smaller VMALLOC_RESERVE.\n",
  1271 + "Reconfigure the kernel with smaller VMALLOC_RESERVE.\n",
1273 1272 VMALLOC_START);
1274 1273 #endif
1275 1274 }
arch/tile/mm/fault.c
Diff comments   View file @ 4b12909
... ... @@ -149,8 +149,6 @@
149 149 pmd_k = vmalloc_sync_one(pgd, address);
150 150 if (!pmd_k)
151 151 return -1;
152   - if (pmd_huge(*pmd_k))
153   - return 0; /* support TILE huge_vmap() API */
154 152 pte_k = pte_offset_kernel(pmd_k, address);
155 153 if (!pte_present(*pte_k))
156 154 return -1;
... ... @@ -828,10 +828,6 @@
828 828 printk(KERN_DEBUG " PKMAP %#lx - %#lx\n",
829 829 PKMAP_BASE, PKMAP_ADDR(LAST_PKMAP) - 1);
830 830 #endif
831   -#ifdef CONFIG_HUGEVMAP
832   - printk(KERN_DEBUG " HUGEMAP %#lx - %#lx\n",
833   - HUGE_VMAP_BASE, HUGE_VMAP_END - 1);
834   -#endif
835 831 printk(KERN_DEBUG " VMALLOC %#lx - %#lx\n",
836 832 _VMALLOC_START, _VMALLOC_END - 1);
837 833 #ifdef __tilegx__