diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-20 19:30:33 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-20 19:30:33 +0300 |
commit | 6e51b4b5bbc07e52b226017936874715629932d1 (patch) | |
tree | 4e1cf0cd689a501ab1397566fb7efe90ae5c59cd /arch/mips/include/asm/setup.h | |
parent | 80f9d9023058e156eb09226ac339f56a8411bc8a (diff) | |
parent | 07e6a6d7f1d9fa4685003a195032698ba99577bb (diff) | |
download | linux-6e51b4b5bbc07e52b226017936874715629932d1.tar.xz |
Merge tag 'mips_6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
Pull MIPS updates from Thomas Bogendoerfer:
"Just cleanups and fixes"
* tag 'mips_6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (24 commits)
MIPS: Take in account load hazards for HI/LO restoring
MIPS: SGI-IP27: use WARN_ON() output
MIPS: SGI-IP27: fix -Wunused-variable in arch_init_irq()
MIPS: SGI-IP27: micro-optimize arch_init_irq()
mips: dts: ralink: mt7621: reorder the attributes of the root node
mips: dts: ralink: mt7621: reorder pci?_phy attributes
mips: dts: ralink: mt7621: reorder pcie node attributes and children
mips: dts: ralink: mt7621: reorder ethernet node attributes and kids
mips: dts: ralink: mt7621: reorder gic node attributes
mips: dts: ralink: mt7621: reorder mmc node attributes
mips: dts: ralink: mt7621: move pinctrl and sort its children
mips: dts: ralink: mt7621: reorder spi0 node attributes
mips: dts: ralink: mt7621: reorder i2c node attributes
mips: dts: ralink: mt7621: reorder gpio node attributes
mips: dts: ralink: mt7621: reorder sysc node attributes
mips: dts: ralink: mt7621: reorder mmc regulator attributes
mips: dts: ralink: mt7621: reorder cpuintc node attributes
mips: dts: ralink: mt7621: reorder cpu node attributes
MIPS: Add prototypes for plat_post_relocation() and relocate_kernel()
MIPS: Octeon: Add PCIe link status check
...
Diffstat (limited to 'arch/mips/include/asm/setup.h')
-rw-r--r-- | arch/mips/include/asm/setup.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/mips/include/asm/setup.h b/arch/mips/include/asm/setup.h index 4dce41138bad..d8077136372c 100644 --- a/arch/mips/include/asm/setup.h +++ b/arch/mips/include/asm/setup.h @@ -2,6 +2,7 @@ #ifndef _MIPS_SETUP_H #define _MIPS_SETUP_H +#include <linux/init.h> #include <linux/types.h> #include <uapi/asm/setup.h> @@ -29,4 +30,9 @@ extern void per_cpu_trap_init(bool); extern void cpu_cache_init(void); extern void tlb_init(void); +#ifdef CONFIG_RELOCATABLE +extern void * __init relocate_kernel(void); +extern int plat_post_relocation(long); +#endif + #endif /* __SETUP_H */ |