From 21d81338ee0b42a489ac05b61ea6d33348ef164e Mon Sep 17 00:00:00 2001
From: Ben Marsh <ben.marsh@helvar.com>
Date: Mon, 8 Jul 2024 14:39:09 +0100
Subject: [PATCH] build: Prefix missed generated syscall includes

PR #63973 namespaced generated headers with zephyr/, including generated
syscall headers.

Since then, some new generated syscall header includes have been added
without the zephyr/ prefix, breaking builds when
CONFIG_LEGACY_GENERATED_INCLUDE_PATH is disabled.

This commit adds the zephyr/ prefix to includes for generated syscall
headers where it has been missed.

Signed-off-by: Ben Marsh <ben.marsh@helvar.com>
---
 drivers/flash/flash_handlers.c | 4 ++--
 include/zephyr/drivers/mspi.h  | 2 +-
 include/zephyr/drivers/tee.h   | 2 +-
 kernel/device.c                | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/flash/flash_handlers.c b/drivers/flash/flash_handlers.c
index 338c6c8402d61ea..b560ea8ae4baaea 100644
--- a/drivers/flash/flash_handlers.c
+++ b/drivers/flash/flash_handlers.c
@@ -56,7 +56,7 @@ int z_vrfy_flash_fill(const struct device *dev, uint8_t val, off_t offset,
 	K_OOPS(K_SYSCALL_OBJ(dev, K_OBJ_DRIVER_FLASH));
 	return z_impl_flash_fill(dev, val, offset, size);
 }
-#include <syscalls/flash_fill_mrsh.c>
+#include <zephyr/syscalls/flash_fill_mrsh.c>
 
 int z_vrfy_flash_flatten(const struct device *dev, off_t offset, size_t size)
 {
@@ -64,7 +64,7 @@ int z_vrfy_flash_flatten(const struct device *dev, off_t offset, size_t size)
 	return z_impl_flash_flatten(dev, offset, size);
 }
 
-#include <syscalls/flash_flatten_mrsh.c>
+#include <zephyr/syscalls/flash_flatten_mrsh.c>
 
 #ifdef CONFIG_FLASH_PAGE_LAYOUT
 static inline int z_vrfy_flash_get_page_info_by_offs(const struct device *dev,
diff --git a/include/zephyr/drivers/mspi.h b/include/zephyr/drivers/mspi.h
index ba7ef0f8cf0a4a7..a8ed10f6f955fbe 100644
--- a/include/zephyr/drivers/mspi.h
+++ b/include/zephyr/drivers/mspi.h
@@ -804,5 +804,5 @@ static inline int mspi_register_callback(const struct device *controller,
 /**
  * @}
  */
-#include <syscalls/mspi.h>
+#include <zephyr/syscalls/mspi.h>
 #endif /* ZEPHYR_INCLUDE_MSPI_H_ */
diff --git a/include/zephyr/drivers/tee.h b/include/zephyr/drivers/tee.h
index d81213f385646c0..5d424478357e740 100644
--- a/include/zephyr/drivers/tee.h
+++ b/include/zephyr/drivers/tee.h
@@ -667,6 +667,6 @@ static inline int z_impl_tee_suppl_send(const struct device *dev, unsigned int r
  * @}
  */
 
-#include <syscalls/tee.h>
+#include <zephyr/syscalls/tee.h>
 
 #endif /* ZEPHYR_INCLUDE_DRIVERS_TEE_H_ */
diff --git a/kernel/device.c b/kernel/device.c
index 64d5a85e4503b8d..c4f4f1ec9fc12c1 100644
--- a/kernel/device.c
+++ b/kernel/device.c
@@ -125,7 +125,7 @@ static inline const struct device *z_vrfy_device_get_by_dt_nodelabel(const char
 
 	return z_impl_device_get_by_dt_nodelabel(nl_copy);
 }
-#include <syscalls/device_get_by_dt_nodelabel_mrsh.c>
+#include <zephyr/syscalls/device_get_by_dt_nodelabel_mrsh.c>
 #endif /* CONFIG_USERSPACE */
 #endif /* CONFIG_DEVICE_DT_METADATA */