diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-03-02 19:34:14 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-03-02 19:34:14 +0100 |
commit | 04a357b1f6f0b6f7c8689361fa8802e8e35d02ad (patch) | |
tree | 00acf8b0227d582929c812a114a5edcc650eac10 /arch/mips/include/asm/smp-cps.h | |
parent | Merge tag 'objtool-core-2023-03-02' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
parent | MIPS: Workaround clang inline compat branch issue (diff) | |
download | linux-04a357b1f6f0b6f7c8689361fa8802e8e35d02ad.tar.xz linux-04a357b1f6f0b6f7c8689361fa8802e8e35d02ad.zip |
Merge tag 'mips_6.3_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
Pull more MIPS updates from Thomas Bogendoerfer:
"A few more cleanups and fixes"
* tag 'mips_6.3_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
MIPS: Workaround clang inline compat branch issue
mips: dts: ralink: mt7621: add phandle to system controller node for watchdog
mips: dts: ralink: mt7621: rename watchdog node from 'wdt' into 'watchdog'
mips: ralink: make SOC_MT7621 select PINCTRL
mips: remove SYS_HAS_CPU_MIPS32_R1 from RALINK
MIPS: cevt-r4k: Offset the value used to clear compare interrupt
MIPS: smp-cps: Don't rely on CP0_CMGCRBASE
MIPS: Remove DMA_PERDEV_COHERENT
Diffstat (limited to 'arch/mips/include/asm/smp-cps.h')
-rw-r--r-- | arch/mips/include/asm/smp-cps.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/mips/include/asm/smp-cps.h b/arch/mips/include/asm/smp-cps.h index 7e5b9411faee..22a572b70fe3 100644 --- a/arch/mips/include/asm/smp-cps.h +++ b/arch/mips/include/asm/smp-cps.h @@ -7,6 +7,8 @@ #ifndef __MIPS_ASM_SMP_CPS_H__ #define __MIPS_ASM_SMP_CPS_H__ +#define CPS_ENTRY_PATCH_INSNS 6 + #ifndef __ASSEMBLY__ struct vpe_boot_config { @@ -30,6 +32,8 @@ extern void mips_cps_boot_vpes(struct core_boot_config *cfg, unsigned vpe); extern void mips_cps_pm_save(void); extern void mips_cps_pm_restore(void); +extern void *mips_cps_core_entry_patch_end; + #ifdef CONFIG_MIPS_CPS extern bool mips_cps_smp_in_use(void); |