Commit f96c6f72 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

s390/mm: remove incorrect _REGION3_ENTRY_ORIGIN define 



_REGION3_ENTRY_ORIGIN defines a wrong mask which can be used to
extract a segment table origin from a region 3 table entry. It removes
only the lower 11 instead of 12 bits from a region 3 table entry.
Luckily this bit is currently always zero, so nothing bad happened yet.

In order to avoid future bugs just remove the region 3 specific mask
and use the correct generic _REGION_ENTRY_ORIGIN mask.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent f5bbd721

arch/s390/include/asm/pgtable.h

+1 −3
Original line number Diff line number Diff line
@@ -301,8 +301,6 @@ static inline int is_module_addr(void *addr) 
#define _REGION3_ENTRY_EMPTY	(_REGION_ENTRY_TYPE_R3 | _REGION_ENTRY_INVALID)



#define _REGION3_ENTRY_ORIGIN_LARGE ~0x7fffffffUL /* large page address	     */

#define _REGION3_ENTRY_ORIGIN  ~0x7ffUL/* region third table origin	     */



#define _REGION3_ENTRY_DIRTY	0x2000	/* SW region dirty bit */

#define _REGION3_ENTRY_YOUNG	0x1000	/* SW region young bit */

#define _REGION3_ENTRY_LARGE	0x0400	/* RTTE-format control, large page  */
@@ -641,7 +639,7 @@ static inline unsigned long pud_pfn(pud_t pud) 
{

	unsigned long origin_mask;



	origin_mask = _REGION3_ENTRY_ORIGIN;

	origin_mask = _REGION_ENTRY_ORIGIN;

	if (pud_large(pud))

		origin_mask = _REGION3_ENTRY_ORIGIN_LARGE;

	return (pud_val(pud) & origin_mask) >> PAGE_SHIFT;

CRA Git | Maintained and supported by SUSTech CRA and CCSE