Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'parisc-for-6.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc architecture fixes from Helge Deller:
- Fix encoding of swp_entry due to added SWP_EXCLUSIVE flag
- Include reboot.h to avoid gcc-12 compiler warning
* tag 'parisc-for-6.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: Fix encoding of swp_entry due to added SWP_EXCLUSIVE flag
parisc: kexec: include reboot.h
+6
-4
+4
-4
arch/parisc/include/asm/pgtable.h
+4
-4
arch/parisc/include/asm/pgtable.h
···
413
413
* For the 64bit version, the offset is extended by 32bit.
414
414
*/
415
415
#define __swp_type(x) ((x).val & 0x1f)
416
-
#define __swp_offset(x) ( (((x).val >> 6) & 0x7) | \
417
-
(((x).val >> 8) & ~0x7) )
416
+
#define __swp_offset(x) ( (((x).val >> 5) & 0x7) | \
417
+
(((x).val >> 10) << 3) )
418
418
#define __swp_entry(type, offset) ((swp_entry_t) { \
419
419
((type) & 0x1f) | \
420
-
((offset & 0x7) << 6) | \
421
-
((offset & ~0x7) << 8) })
420
+
((offset & 0x7) << 5) | \
421
+
((offset >> 3) << 10) })
422
422
#define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) })
423
423
#define __swp_entry_to_pte(x) ((pte_t) { (x).val })
424
424