diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2022-03-23 09:59:26 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2022-03-23 09:59:26 +0100 |
| commit | 412370414c3c7cfe504e2af1d8c98d7a912e6c9a (patch) | |
| tree | 0387b3a65ee385f18a0705f6db59f9768d413336 /arch/riscv/kernel/head.h | |
| parent | b690490d6d466972ade172ee2e7f6ffa49e7e910 (diff) | |
| parent | ed9f4f961260de51ed76d903e86b35ee8ce8eeb3 (diff) | |
| download | linux-412370414c3c7cfe504e2af1d8c98d7a912e6c9a.tar.bz2 | |
Merge branch 'for-5.18/apple' into for-linus
- Apple magic keyboard support improvements for newer models (José Expósito)
- Apple T2 Macs support improvements (Aun-Ali Zaidi, Paul Pawlowski)
Diffstat (limited to 'arch/riscv/kernel/head.h')
| -rw-r--r-- | arch/riscv/kernel/head.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/riscv/kernel/head.h b/arch/riscv/kernel/head.h index aabbc3ac3e48..726731ada534 100644 --- a/arch/riscv/kernel/head.h +++ b/arch/riscv/kernel/head.h @@ -16,7 +16,9 @@ asmlinkage void __init setup_vm(uintptr_t dtb_pa); asmlinkage void __init __copy_data(void); #endif -extern void *__cpu_up_stack_pointer[]; -extern void *__cpu_up_task_pointer[]; +#ifdef CONFIG_RISCV_BOOT_SPINWAIT +extern void *__cpu_spinwait_stack_pointer[]; +extern void *__cpu_spinwait_task_pointer[]; +#endif #endif /* __ASM_HEAD_H */ |