tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

s390/mm: use TASK_MAX_SIZE where applicable

To improve readability we can use TASK_MAX_SIZE when we just check for the
upper limit. All places explicitly dealing with 3 vs 4 level pgtables
were left unchanged.

Signed-off-by: Dominik Dingel <dingel@linux.vnet.ibm.com>
Reviewed-By: Sascha Silbe <silbe@linux.vnet.ibm.com>

authored by

Dominik Dingel and committed by
Martin Schwidefsky a9d7ab97 a200dcb3

+7 -7
+6 -6
arch/s390/mm/mmap.c
··· 169 169 170 170 int s390_mmap_check(unsigned long addr, unsigned long len, unsigned long flags) 171 171 { 172 - if (is_compat_task() || (TASK_SIZE >= (1UL << 53))) 172 + if (is_compat_task() || TASK_SIZE >= TASK_MAX_SIZE) 173 173 return 0; 174 174 if (!(flags & MAP_FIXED)) 175 175 addr = 0; 176 176 if ((addr + len) >= TASK_SIZE) 177 - return crst_table_upgrade(current->mm, 1UL << 53); 177 + return crst_table_upgrade(current->mm, TASK_MAX_SIZE); 178 178 return 0; 179 179 } 180 180 ··· 189 189 area = arch_get_unmapped_area(filp, addr, len, pgoff, flags); 190 190 if (!(area & ~PAGE_MASK)) 191 191 return area; 192 - if (area == -ENOMEM && !is_compat_task() && TASK_SIZE < (1UL << 53)) { 192 + if (area == -ENOMEM && !is_compat_task() && TASK_SIZE < TASK_MAX_SIZE) { 193 193 /* Upgrade the page table to 4 levels and retry. */ 194 - rc = crst_table_upgrade(mm, 1UL << 53); 194 + rc = crst_table_upgrade(mm, TASK_MAX_SIZE); 195 195 if (rc) 196 196 return (unsigned long) rc; 197 197 area = arch_get_unmapped_area(filp, addr, len, pgoff, flags); ··· 211 211 area = arch_get_unmapped_area_topdown(filp, addr, len, pgoff, flags); 212 212 if (!(area & ~PAGE_MASK)) 213 213 return area; 214 - if (area == -ENOMEM && !is_compat_task() && TASK_SIZE < (1UL << 53)) { 214 + if (area == -ENOMEM && !is_compat_task() && TASK_SIZE < TASK_MAX_SIZE) { 215 215 /* Upgrade the page table to 4 levels and retry. */ 216 - rc = crst_table_upgrade(mm, 1UL << 53); 216 + rc = crst_table_upgrade(mm, TASK_MAX_SIZE); 217 217 if (rc) 218 218 return (unsigned long) rc; 219 219 area = arch_get_unmapped_area_topdown(filp, addr, len,
+1 -1
arch/s390/mm/pgtable.c
··· 55 55 unsigned long entry; 56 56 int flush; 57 57 58 - BUG_ON(limit > (1UL << 53)); 58 + BUG_ON(limit > TASK_MAX_SIZE); 59 59 flush = 0; 60 60 repeat: 61 61 table = crst_table_alloc(mm);