Commit 3d386c0ef60cf4810f6d5c62b637a8fb55ec9b2e
1 parent
6066fc3dc4
Exists in
smarc-l5.0.0_1.0.0-ga
and in
5 other branches
sparc32: Un-btfixup PGDIR_{SHIFT,SIZE,MASK} {USER_,}PTRS_PER_{PGD,PMD}
Only one set of values exist, the SRMMU ones. Signed-off-by: David S. Miller <davem@davemloft.net>
Showing 2 changed files with 6 additions and 23 deletions Side-by-side Diff
arch/sparc/include/asm/pgtable_32.h
| ... | ... | @@ -28,14 +28,6 @@ |
| 28 | 28 | extern void load_mmu(void); |
| 29 | 29 | extern unsigned long calc_highpages(void); |
| 30 | 30 | |
| 31 | -BTFIXUPDEF_SIMM13(pgdir_shift) | |
| 32 | -BTFIXUPDEF_SETHI(pgdir_size) | |
| 33 | -BTFIXUPDEF_SETHI(pgdir_mask) | |
| 34 | - | |
| 35 | -BTFIXUPDEF_SIMM13(ptrs_per_pmd) | |
| 36 | -BTFIXUPDEF_SIMM13(ptrs_per_pgd) | |
| 37 | -BTFIXUPDEF_SIMM13(user_ptrs_per_pgd) | |
| 38 | - | |
| 39 | 31 | #define pte_ERROR(e) __builtin_trap() |
| 40 | 32 | #define pmd_ERROR(e) __builtin_trap() |
| 41 | 33 | #define pgd_ERROR(e) __builtin_trap() |
| 42 | 34 | |
| ... | ... | @@ -49,13 +41,13 @@ |
| 49 | 41 | #define PMD_SIZE (1UL << PMD_SHIFT) |
| 50 | 42 | #define PMD_MASK (~(PMD_SIZE-1)) |
| 51 | 43 | #define PMD_ALIGN(__addr) (((__addr) + ~PMD_MASK) & PMD_MASK) |
| 52 | -#define PGDIR_SHIFT BTFIXUP_SIMM13(pgdir_shift) | |
| 53 | -#define PGDIR_SIZE BTFIXUP_SETHI(pgdir_size) | |
| 54 | -#define PGDIR_MASK BTFIXUP_SETHI(pgdir_mask) | |
| 44 | +#define PGDIR_SHIFT SRMMU_PGDIR_SHIFT | |
| 45 | +#define PGDIR_SIZE SRMMU_PGDIR_SIZE | |
| 46 | +#define PGDIR_MASK SRMMU_PGDIR_MASK | |
| 55 | 47 | #define PTRS_PER_PTE 1024 |
| 56 | -#define PTRS_PER_PMD BTFIXUP_SIMM13(ptrs_per_pmd) | |
| 57 | -#define PTRS_PER_PGD BTFIXUP_SIMM13(ptrs_per_pgd) | |
| 58 | -#define USER_PTRS_PER_PGD BTFIXUP_SIMM13(user_ptrs_per_pgd) | |
| 48 | +#define PTRS_PER_PMD SRMMU_PTRS_PER_PMD | |
| 49 | +#define PTRS_PER_PGD SRMMU_PTRS_PER_PGD | |
| 50 | +#define USER_PTRS_PER_PGD PAGE_OFFSET / SRMMU_PGDIR_SIZE | |
| 59 | 51 | #define FIRST_USER_ADDRESS 0 |
| 60 | 52 | #define PTE_SIZE (PTRS_PER_PTE*4) |
| 61 | 53 |
arch/sparc/mm/srmmu.c
| ... | ... | @@ -1248,8 +1248,6 @@ |
| 1248 | 1248 | for (i = 0; sp_banks[i].num_bytes != 0; i++) { |
| 1249 | 1249 | map_spbank((unsigned long)__va(sp_banks[i].base_addr), i); |
| 1250 | 1250 | } |
| 1251 | - | |
| 1252 | - BTFIXUPSET_SIMM13(user_ptrs_per_pgd, PAGE_OFFSET / SRMMU_PGDIR_SIZE); | |
| 1253 | 1251 | } |
| 1254 | 1252 | |
| 1255 | 1253 | /* Paging initialization on the Sparc Reference MMU. */ |
| ... | ... | @@ -2144,13 +2142,6 @@ |
| 2144 | 2142 | extern void ld_mmu_iommu(void); |
| 2145 | 2143 | extern void ld_mmu_iounit(void); |
| 2146 | 2144 | extern void ___xchg32_sun4md(void); |
| 2147 | - | |
| 2148 | - BTFIXUPSET_SIMM13(pgdir_shift, SRMMU_PGDIR_SHIFT); | |
| 2149 | - BTFIXUPSET_SETHI(pgdir_size, SRMMU_PGDIR_SIZE); | |
| 2150 | - BTFIXUPSET_SETHI(pgdir_mask, SRMMU_PGDIR_MASK); | |
| 2151 | - | |
| 2152 | - BTFIXUPSET_SIMM13(ptrs_per_pmd, SRMMU_PTRS_PER_PMD); | |
| 2153 | - BTFIXUPSET_SIMM13(ptrs_per_pgd, SRMMU_PTRS_PER_PGD); | |
| 2154 | 2145 | |
| 2155 | 2146 | BTFIXUPSET_INT(page_none, pgprot_val(SRMMU_PAGE_NONE)); |
| 2156 | 2147 | PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED); |