Commit 6f9e9884 authored by Helge Deller's avatar Helge Deller
Browse files

parisc: Fix encoding of swp_entry due to added SWP_EXCLUSIVE flag 



Fix the __swp_offset() and __swp_entry() macros due to commit 6d239fc7
("parisc/mm: support __HAVE_ARCH_PTE_SWP_EXCLUSIVE") which introduced the
SWP_EXCLUSIVE flag by reusing the _PAGE_ACCESSED flag.

Reported-by: default avatarChristoph Biedl <linux-kernel.bfrz@manchmal.in-ulm.de>
Tested-by: default avatarChristoph Biedl <linux-kernel.bfrz@manchmal.in-ulm.de>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
Fixes: 6d239fc7 ("parisc/mm: support __HAVE_ARCH_PTE_SWP_EXCLUSIVE")
Cc: <stable@vger.kernel.org> # v6.3+
parent cc719a9c

arch/parisc/include/asm/pgtable.h

+4 −4
Original line number Diff line number Diff line
@@ -413,12 +413,12 @@ extern void paging_init (void); 
 *   For the 64bit version, the offset is extended by 32bit.

 */

#define __swp_type(x)                     ((x).val & 0x1f)

#define __swp_offset(x)                   ( (((x).val >> 6) &  0x7) | \

					  (((x).val >> 8) & ~0x7) )

#define __swp_offset(x)                   ( (((x).val >> 5) & 0x7) | \

					  (((x).val >> 10) << 3) )

#define __swp_entry(type, offset)         ((swp_entry_t) { \

					    ((type) & 0x1f) | \

					    ((offset &  0x7) << 6) | \

					    ((offset & ~0x7) << 8) })

					    ((offset & 0x7) << 5) | \

					    ((offset >> 3) << 10) })

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

#define __swp_entry_to_pte(x)		((pte_t) { (x).val })