diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
| commit | a56e74f546b64be93731e42d83baf5b538cc1b11 (patch) | |
| tree | 18f6dee45d801e57ac9db2a31664b0d5c0762c50 /arch/tile/include/asm/pgtable_32.h | |
| parent | d08e2e09042bd3f7ef66a35cb4bb92794ab26bb2 (diff) | |
| parent | e4e7f10bfc4069925e99cc4b428c3434e30b6c3f (diff) | |
Merge branch 'arm-aesbs' of git://git.linaro.org/people/ardbiesheuvel/linux-arm into devel-stable
Diffstat (limited to 'arch/tile/include/asm/pgtable_32.h')
| -rw-r--r-- | arch/tile/include/asm/pgtable_32.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/arch/tile/include/asm/pgtable_32.h b/arch/tile/include/asm/pgtable_32.h index 63142ab3b3dd..d26a42279036 100644 --- a/arch/tile/include/asm/pgtable_32.h +++ b/arch/tile/include/asm/pgtable_32.h | |||
| @@ -55,17 +55,9 @@ | |||
| 55 | #define PKMAP_BASE ((FIXADDR_BOOT_START - PAGE_SIZE*LAST_PKMAP) & PGDIR_MASK) | 55 | #define PKMAP_BASE ((FIXADDR_BOOT_START - PAGE_SIZE*LAST_PKMAP) & PGDIR_MASK) |
| 56 | 56 | ||
| 57 | #ifdef CONFIG_HIGHMEM | 57 | #ifdef CONFIG_HIGHMEM |
| 58 | # define __VMAPPING_END (PKMAP_BASE & ~(HPAGE_SIZE-1)) | 58 | # define _VMALLOC_END (PKMAP_BASE & ~(HPAGE_SIZE-1)) |
| 59 | #else | 59 | #else |
| 60 | # define __VMAPPING_END (FIXADDR_START & ~(HPAGE_SIZE-1)) | 60 | # define _VMALLOC_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 | ||
| 69 | #endif | 61 | #endif |
| 70 | 62 | ||
| 71 | /* | 63 | /* |