Skip to content

Commit

Permalink
build: Prefix missed generated syscall includes
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
besmarsh committed Jul 8, 2024
1 parent 1ed04e7 commit 2d6536d
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions drivers/flash/flash_handlers.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@ 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)
{
K_OOPS(K_SYSCALL_OBJ(dev, K_OBJ_DRIVER_FLASH));
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,
Expand Down
2 changes: 1 addition & 1 deletion include/zephyr/drivers/mspi.h
Original file line number Diff line number Diff line change
Expand Up @@ -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_ */
2 changes: 1 addition & 1 deletion include/zephyr/drivers/tee.h
Original file line number Diff line number Diff line change
Expand Up @@ -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_ */
2 changes: 1 addition & 1 deletion kernel/device.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down

0 comments on commit 2d6536d

Please sign in to comment.