From 92ebb2eb69f035605769da5b647edd2d0d83e19c Mon Sep 17 00:00:00 2001
From: Daniel Leung <daniel.leung@intel.com>
Date: Thu, 24 Apr 2025 12:05:16 -0700
Subject: [PATCH] kernel: remove kernel/internal/smp.h

There is no need for kernel/internal/smp.h as SOF does not call
z_sched_ipi(). Actually... git log over there has no mention of
z_sched_ipi() anywhere, just arch_sched_ipi().

And include <ksched.h> for source using z_sched_ipi() since
they are using scheduling functions, and would be the correct
file to include.

Signed-off-by: Daniel Leung <daniel.leung@intel.com>
---
 arch/arm/core/cortex_a_r/smp.c              |  1 +
 arch/x86/core/intel64/smp.c                 |  1 +
 include/zephyr/kernel/internal/smp.h        | 11 -----------
 include/zephyr/kernel_includes.h            |  2 --
 soc/intel/intel_adsp/ace/multiprocessing.c  |  1 +
 soc/intel/intel_adsp/cavs/multiprocessing.c |  1 +
 6 files changed, 4 insertions(+), 13 deletions(-)
 delete mode 100644 include/zephyr/kernel/internal/smp.h

diff --git a/arch/arm/core/cortex_a_r/smp.c b/arch/arm/core/cortex_a_r/smp.c
index d0e31acb1ed..170a5943f39 100644
--- a/arch/arm/core/cortex_a_r/smp.c
+++ b/arch/arm/core/cortex_a_r/smp.c
@@ -5,6 +5,7 @@
 
 #include <zephyr/kernel/thread_stack.h>
 #include <zephyr/kernel.h>
+#include <ksched.h>
 #include <zephyr/arch/arm/cortex_a_r/lib_helpers.h>
 #include <zephyr/drivers/interrupt_controller/gic.h>
 #include <ipi.h>
diff --git a/arch/x86/core/intel64/smp.c b/arch/x86/core/intel64/smp.c
index 90bd9724667..d6c18cec9e6 100644
--- a/arch/x86/core/intel64/smp.c
+++ b/arch/x86/core/intel64/smp.c
@@ -8,6 +8,7 @@
 #include <kernel_arch_data.h>
 #include <x86_mmu.h>
 #include <zephyr/init.h>
+#include <ksched.h>
 
 #define NR_IRQ_VECTORS (IV_NR_VECTORS - IV_IRQS)  /* # vectors free for IRQs */
 
diff --git a/include/zephyr/kernel/internal/smp.h b/include/zephyr/kernel/internal/smp.h
deleted file mode 100644
index 98c1391e266..00000000000
--- a/include/zephyr/kernel/internal/smp.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright (c) 2023 Intel Corporation
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#ifndef ZEPHYR_INCLUDE_KERNEL_INTERNAL_SMP_H_
-#define ZEPHYR_INCLUDE_KERNEL_INTERNAL_SMP_H_
-
-void z_sched_ipi(void);
-
-#endif /* ZEPHYR_INCLUDE_KERNEL_INTERNAL_SMP_H_ */
diff --git a/include/zephyr/kernel_includes.h b/include/zephyr/kernel_includes.h
index 3279d264584..d976c944f60 100644
--- a/include/zephyr/kernel_includes.h
+++ b/include/zephyr/kernel_includes.h
@@ -43,7 +43,5 @@
 #include <zephyr/app_memory/mem_domain.h>
 #include <zephyr/sys/kobject.h>
 #include <zephyr/kernel/thread.h>
-/* FIXME This needs to be removed. Exposes some private APIs to SOF */
-#include <zephyr/kernel/internal/smp.h>
 
 #endif /* ZEPHYR_INCLUDE_KERNEL_INCLUDES_H_ */
diff --git a/soc/intel/intel_adsp/ace/multiprocessing.c b/soc/intel/intel_adsp/ace/multiprocessing.c
index 77ab0057238..5d65af42683 100644
--- a/soc/intel/intel_adsp/ace/multiprocessing.c
+++ b/soc/intel/intel_adsp/ace/multiprocessing.c
@@ -12,6 +12,7 @@
 #include <zephyr/arch/xtensa/arch.h>
 #include <zephyr/pm/pm.h>
 #include <zephyr/pm/device_runtime.h>
+#include <ksched.h>
 
 #include <soc.h>
 #include <adsp_boot.h>
diff --git a/soc/intel/intel_adsp/cavs/multiprocessing.c b/soc/intel/intel_adsp/cavs/multiprocessing.c
index 939f6699229..5a1d5d95a31 100644
--- a/soc/intel/intel_adsp/cavs/multiprocessing.c
+++ b/soc/intel/intel_adsp/cavs/multiprocessing.c
@@ -2,6 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <zephyr/kernel.h>
+#include <ksched.h>
 #include <cavs-idc.h>
 #include <adsp_memory.h>
 #include <adsp_shim.h>