Commit 838a8548 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 01bc9325 6f9e9884

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 })

arch/parisc/kernel/kexec.c

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 
#include <linux/console.h>

#include <linux/kexec.h>

#include <linux/delay.h>

#include <linux/reboot.h>



#include <asm/cacheflush.h>

#include <asm/sections.h>