Commit 6f74c0ec authored by David Hildenbrand's avatar David Hildenbrand Committed by Andrew Morton
Browse files

arm/mm: fix swp type masking in __swp_entry() 

We're masking with the number of type bits instead of the type mask, which
is obviously wrong.

Link: https://lkml.kernel.org/r/39fd91e3-c93b-23c6-afc6-cbe473bb0ca9@redhat.com


Fixes: 20aae9ef ("arm/mm: support __HAVE_ARCH_PTE_SWP_EXCLUSIVE")
Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Reported-by: default avatarMark Brown <broonie@kernel.org>
Tested-by: default avatarMark Brown <broonie@kernel.org>
Cc: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 9160cffd

arch/arm/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) 


#define __swp_type(x)		(((x).val >> __SWP_TYPE_SHIFT) & __SWP_TYPE_MASK)

#define __swp_offset(x)		((x).val >> __SWP_OFFSET_SHIFT)

#define __swp_entry(type, offset) ((swp_entry_t) { (((type) & __SWP_TYPE_BITS) << __SWP_TYPE_SHIFT) | \

#define __swp_entry(type, offset) ((swp_entry_t) { (((type) & __SWP_TYPE_MASK) << __SWP_TYPE_SHIFT) | \

						   ((offset) << __SWP_OFFSET_SHIFT) })



#define __pte_to_swp_entry(pte)	((swp_entry_t) { pte_val(pte) })