diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-05-14 09:54:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-05-14 09:54:38 -0700 |
| commit | 838a854820eea0d21c6910cc3ab23b78d16aa1dd (patch) | |
| tree | 01a0f98bcb45db2344c391bf2a12fe85d348d4da /arch/parisc/kernel/kexec.c | |
| parent | 01bc932561438be3a33d7c7c89be45f866168c5f (diff) | |
| parent | 6f9e98849edaa8aefc4030ff3500e41556e83ff7 (diff) | |
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
Diffstat (limited to 'arch/parisc/kernel/kexec.c')
| -rw-r--r-- | arch/parisc/kernel/kexec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/parisc/kernel/kexec.c b/arch/parisc/kernel/kexec.c index 5eb7f30edc1f..db57345a9daf 100644 --- a/arch/parisc/kernel/kexec.c +++ b/arch/parisc/kernel/kexec.c @@ -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> |