From 17c51c06678128ecab77d1548a0baa66944fe9dc Mon Sep 17 00:00:00 2001 From: ouyangxiangzhen Date: Wed, 16 Oct 2024 10:49:33 +0800 Subject: [PATCH] userspace: Exclude nuttx/arch.h This patch fixed userspace headers conflict. Architecture-related definition and API should not be exposed to users. Signed-off-by: ouyangxiangzhen --- arch/risc-v/src/bl602/bl602_oneshot_lowerhalf.c | 1 + arch/risc-v/src/bl602/bl602_os_hal.c | 1 + arch/risc-v/src/common/espressif/Make.defs | 2 +- arch/risc-v/src/common/riscv_mtimer.c | 1 + arch/risc-v/src/esp32c3-legacy/Make.defs | 2 +- arch/risc-v/src/esp32c3-legacy/esp32c3_efuse_lowerhalf.c | 2 ++ arch/x86_64/src/intel64/intel64_oneshot.h | 1 + arch/xtensa/src/esp32/Make.defs | 2 +- arch/xtensa/src/esp32/esp32_efuse_lowerhalf.c | 2 ++ arch/xtensa/src/esp32s2/Make.defs | 2 +- arch/xtensa/src/esp32s3/Make.defs | 2 +- binfmt/binfmt_unloadmodule.c | 1 + boards/arm/imxrt/imxrt1050-evk/kernel/imxrt_userspace.c | 2 +- boards/arm/imxrt/imxrt1060-evk/kernel/imxrt_userspace.c | 2 +- boards/arm/imxrt/imxrt1064-evk/kernel/imxrt_userspace.c | 2 +- boards/arm/imxrt/imxrt1170-evk/kernel/imxrt_userspace.c | 2 +- boards/arm/imxrt/teensy-4.x/kernel/imxrt_userspace.c | 2 +- .../lpc17xx_40xx/lpc4088-devkit/kernel/lpc17_40_userspace.c | 2 +- .../lpc4088-quickstart/kernel/lpc17_40_userspace.c | 2 +- boards/arm/lpc17xx_40xx/open1788/kernel/lpc17_40_userspace.c | 2 +- .../arm/lpc17xx_40xx/pnev5180b/kernel/lpc17_40_userspace.c | 2 +- boards/arm/mps/mps2-an500/kernel/mps_userspace.c | 2 +- boards/arm/s32k3xx/mr-canhubk3/kernel/s32k3xx_userspace.c | 2 +- boards/arm/sam34/sam3u-ek/kernel/sam_userspace.c | 2 +- boards/arm/samv7/same70-qmtech/kernel/sam_userspace.c | 2 +- boards/arm/samv7/same70-xplained/kernel/sam_userspace.c | 2 +- boards/arm/samv7/samv71-xult/kernel/sam_userspace.c | 2 +- boards/arm/stm32/mikroe-stm32f4/kernel/stm32_userspace.c | 2 +- boards/arm/stm32/stm3240g-eval/kernel/stm32_userspace.c | 2 +- crypto/cryptosoft.c | 1 + drivers/audio/audio_dma.c | 2 ++ drivers/input/goldfish_events.c | 1 + drivers/input/mouse_upper.c | 1 + drivers/lcd/pcf8574_lcd_backpack.c | 1 + drivers/misc/goldfish_pipe.c | 1 + drivers/misc/mkrd.c | 1 + drivers/misc/optee.c | 2 ++ drivers/mtd/gd25.c | 1 + drivers/mtd/mtd_rwbuffer.c | 1 + drivers/mtd/rammtd.c | 1 + drivers/net/e1000.c | 1 + drivers/net/igc.c | 1 + drivers/pci/pci_ivshmem.c | 1 + drivers/pipes/pipe_common.c | 1 + drivers/power/battery/goldfish_battery.c | 4 +++- drivers/rc/lirc_dev.c | 1 + drivers/sensors/bme680_uorb.c | 1 + drivers/sensors/bmp280_uorb.c | 1 + drivers/sensors/ms56xx_uorb.c | 1 + drivers/serial/uart_16550.c | 1 + drivers/serial/uart_bth4.c | 1 + drivers/timers/pl031.c | 5 ++++- drivers/usbdev/usbdev_fs.c | 1 + drivers/video/fb.c | 1 + drivers/video/mipidsi/mipi_dsi_host.c | 2 ++ drivers/video/v4l2_m2m.c | 1 + drivers/virtio/virtio-mmio.c | 1 + drivers/virtio/virtio-pci.h | 1 + drivers/wireless/bluetooth/bt_bridge.c | 1 + fs/fs_heap.c | 2 ++ fs/mmap/fs_munmap.c | 1 + fs/procfs/fs_procfscritmon.c | 1 + fs/procfs/fs_procfsproc.c | 1 + fs/procfs/fs_procfstcbinfo.c | 1 + fs/shm/shmfs.c | 3 --- fs/tmpfs/fs_tmpfs.c | 1 + fs/vfs/fs_fstat.c | 1 + fs/vfs/fs_open.c | 1 + fs/vfs/fs_pseudofile.c | 1 + fs/vfs/fs_sendfile.c | 1 + fs/vfs/fs_timerfd.c | 1 + include/nuttx/kmalloc.h | 5 ++++- include/nuttx/net/snoop.h | 1 + include/nuttx/notifier.h | 1 + include/nuttx/pci/pci_ivshmem.h | 1 + include/nuttx/userspace.h | 2 -- include/sys/socket.h | 2 +- include/syslog.h | 1 + libs/libc/misc/lib_cxx_initialize.c | 1 + libs/libc/modlib/modlib_bind.c | 1 + libs/libc/modlib/modlib_load.c | 1 + libs/libc/modlib/modlib_unload.c | 1 + libs/libc/stdio/lib_freopen.c | 1 + libs/libc/time/lib_localtime.c | 2 +- mm/umm_heap/umm_calloc.c | 1 + mm/umm_heap/umm_heap.h | 1 + mm/umm_heap/umm_initialize.c | 1 + mm/umm_heap/umm_sbrk.c | 1 + net/local/local_conn.c | 1 + net/netlink/netlink_sockif.c | 1 + net/socket/socket.h | 1 + net/socket/socketpair.c | 1 + net/utils/net_snoop.c | 1 + sched/misc/reboot_notifier.c | 1 + sched/signal/sig_findaction.c | 2 ++ sched/signal/signal.h | 1 + sched/wqueue/kwork_notifier.c | 1 + wireless/ieee802154/ieee802154_primitive.c | 1 + 98 files changed, 111 insertions(+), 32 deletions(-) diff --git a/arch/risc-v/src/bl602/bl602_oneshot_lowerhalf.c b/arch/risc-v/src/bl602/bl602_oneshot_lowerhalf.c index 31775f453df..bab862be6bd 100644 --- a/arch/risc-v/src/bl602/bl602_oneshot_lowerhalf.c +++ b/arch/risc-v/src/bl602/bl602_oneshot_lowerhalf.c @@ -29,6 +29,7 @@ #include #include +#include #include #include #include diff --git a/arch/risc-v/src/bl602/bl602_os_hal.c b/arch/risc-v/src/bl602/bl602_os_hal.c index 3f4f74134b4..375140f3c83 100644 --- a/arch/risc-v/src/bl602/bl602_os_hal.c +++ b/arch/risc-v/src/bl602/bl602_os_hal.c @@ -48,6 +48,7 @@ #include #include +#include #include #include #include diff --git a/arch/risc-v/src/common/espressif/Make.defs b/arch/risc-v/src/common/espressif/Make.defs index af6ae2f4d3f..c538643a1e1 100644 --- a/arch/risc-v/src/common/espressif/Make.defs +++ b/arch/risc-v/src/common/espressif/Make.defs @@ -136,7 +136,7 @@ endif ESP_HAL_3RDPARTY_REPO = esp-hal-3rdparty ifndef ESP_HAL_3RDPARTY_VERSION - ESP_HAL_3RDPARTY_VERSION = ca869dd97ed2c01187b85b759c0d6edb27c12c21 + ESP_HAL_3RDPARTY_VERSION = e3899a2324c8e326db20f99f208e890fdd7a5b92 endif ifndef ESP_HAL_3RDPARTY_URL diff --git a/arch/risc-v/src/common/riscv_mtimer.c b/arch/risc-v/src/common/riscv_mtimer.c index b611c3dd999..fd134425c98 100644 --- a/arch/risc-v/src/common/riscv_mtimer.c +++ b/arch/risc-v/src/common/riscv_mtimer.c @@ -22,6 +22,7 @@ * Included Files ****************************************************************************/ +#include #include #include diff --git a/arch/risc-v/src/esp32c3-legacy/Make.defs b/arch/risc-v/src/esp32c3-legacy/Make.defs index a6dd8f19315..9aea2122b50 100644 --- a/arch/risc-v/src/esp32c3-legacy/Make.defs +++ b/arch/risc-v/src/esp32c3-legacy/Make.defs @@ -239,7 +239,7 @@ endif ESP_HAL_3RDPARTY_REPO = esp-hal-3rdparty ifndef ESP_HAL_3RDPARTY_VERSION - ESP_HAL_3RDPARTY_VERSION = 51afbfd1a17e806fa6fd8227a18395c1bbecbad3 + ESP_HAL_3RDPARTY_VERSION = e3899a2324c8e326db20f99f208e890fdd7a5b92 endif ifndef ESP_HAL_3RDPARTY_URL diff --git a/arch/risc-v/src/esp32c3-legacy/esp32c3_efuse_lowerhalf.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_efuse_lowerhalf.c index 0364e260d32..210e46f0383 100644 --- a/arch/risc-v/src/esp32c3-legacy/esp32c3_efuse_lowerhalf.c +++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_efuse_lowerhalf.c @@ -25,6 +25,8 @@ #include #include #include + +#include #include #include diff --git a/arch/x86_64/src/intel64/intel64_oneshot.h b/arch/x86_64/src/intel64/intel64_oneshot.h index db4b0859aa4..37072457eaa 100644 --- a/arch/x86_64/src/intel64/intel64_oneshot.h +++ b/arch/x86_64/src/intel64/intel64_oneshot.h @@ -28,6 +28,7 @@ #include #include +#include #include diff --git a/arch/xtensa/src/esp32/Make.defs b/arch/xtensa/src/esp32/Make.defs index 43990fcde06..2980a857377 100644 --- a/arch/xtensa/src/esp32/Make.defs +++ b/arch/xtensa/src/esp32/Make.defs @@ -216,7 +216,7 @@ endif ESP_HAL_3RDPARTY_REPO = esp-hal-3rdparty ifndef ESP_HAL_3RDPARTY_VERSION - ESP_HAL_3RDPARTY_VERSION = b4c723a119344b4b71d69819019d55637fb570fd + ESP_HAL_3RDPARTY_VERSION = e3899a2324c8e326db20f99f208e890fdd7a5b92 endif ifndef ESP_HAL_3RDPARTY_URL diff --git a/arch/xtensa/src/esp32/esp32_efuse_lowerhalf.c b/arch/xtensa/src/esp32/esp32_efuse_lowerhalf.c index 88730d844a6..59127bc0714 100644 --- a/arch/xtensa/src/esp32/esp32_efuse_lowerhalf.c +++ b/arch/xtensa/src/esp32/esp32_efuse_lowerhalf.c @@ -25,6 +25,8 @@ #include #include #include + +#include #include #include diff --git a/arch/xtensa/src/esp32s2/Make.defs b/arch/xtensa/src/esp32s2/Make.defs index 840ea0cdcfe..5328d62dec4 100644 --- a/arch/xtensa/src/esp32s2/Make.defs +++ b/arch/xtensa/src/esp32s2/Make.defs @@ -145,7 +145,7 @@ endif ESP_HAL_3RDPARTY_REPO = esp-hal-3rdparty ifndef ESP_HAL_3RDPARTY_VERSION - ESP_HAL_3RDPARTY_VERSION = b4c723a119344b4b71d69819019d55637fb570fd + ESP_HAL_3RDPARTY_VERSION = e3899a2324c8e326db20f99f208e890fdd7a5b92 endif ifndef ESP_HAL_3RDPARTY_URL diff --git a/arch/xtensa/src/esp32s3/Make.defs b/arch/xtensa/src/esp32s3/Make.defs index e9a461ebce0..4a9c9d34205 100644 --- a/arch/xtensa/src/esp32s3/Make.defs +++ b/arch/xtensa/src/esp32s3/Make.defs @@ -218,7 +218,7 @@ endif ESP_HAL_3RDPARTY_REPO = esp-hal-3rdparty ifndef ESP_HAL_3RDPARTY_VERSION - ESP_HAL_3RDPARTY_VERSION = b4c723a119344b4b71d69819019d55637fb570fd + ESP_HAL_3RDPARTY_VERSION = e3899a2324c8e326db20f99f208e890fdd7a5b92 endif ifndef ESP_HAL_3RDPARTY_URL diff --git a/binfmt/binfmt_unloadmodule.c b/binfmt/binfmt_unloadmodule.c index c8e51adb943..50eaf4294b1 100644 --- a/binfmt/binfmt_unloadmodule.c +++ b/binfmt/binfmt_unloadmodule.c @@ -32,6 +32,7 @@ #include #include +#include #include #include #include diff --git a/boards/arm/imxrt/imxrt1050-evk/kernel/imxrt_userspace.c b/boards/arm/imxrt/imxrt1050-evk/kernel/imxrt_userspace.c index 8f89166dd30..d94e61da890 100644 --- a/boards/arm/imxrt/imxrt1050-evk/kernel/imxrt_userspace.c +++ b/boards/arm/imxrt/imxrt1050-evk/kernel/imxrt_userspace.c @@ -26,7 +26,7 @@ #include -#include +#include #include #include diff --git a/boards/arm/imxrt/imxrt1060-evk/kernel/imxrt_userspace.c b/boards/arm/imxrt/imxrt1060-evk/kernel/imxrt_userspace.c index 83407a4053d..142051853c4 100644 --- a/boards/arm/imxrt/imxrt1060-evk/kernel/imxrt_userspace.c +++ b/boards/arm/imxrt/imxrt1060-evk/kernel/imxrt_userspace.c @@ -26,7 +26,7 @@ #include -#include +#include #include #include diff --git a/boards/arm/imxrt/imxrt1064-evk/kernel/imxrt_userspace.c b/boards/arm/imxrt/imxrt1064-evk/kernel/imxrt_userspace.c index 4193f03be0b..fb069feeca4 100644 --- a/boards/arm/imxrt/imxrt1064-evk/kernel/imxrt_userspace.c +++ b/boards/arm/imxrt/imxrt1064-evk/kernel/imxrt_userspace.c @@ -26,7 +26,7 @@ #include -#include +#include #include #include diff --git a/boards/arm/imxrt/imxrt1170-evk/kernel/imxrt_userspace.c b/boards/arm/imxrt/imxrt1170-evk/kernel/imxrt_userspace.c index 137d27c490d..7a26aad8a5a 100644 --- a/boards/arm/imxrt/imxrt1170-evk/kernel/imxrt_userspace.c +++ b/boards/arm/imxrt/imxrt1170-evk/kernel/imxrt_userspace.c @@ -26,7 +26,7 @@ #include -#include +#include #include #include diff --git a/boards/arm/imxrt/teensy-4.x/kernel/imxrt_userspace.c b/boards/arm/imxrt/teensy-4.x/kernel/imxrt_userspace.c index ebae176799a..2a895df2e61 100644 --- a/boards/arm/imxrt/teensy-4.x/kernel/imxrt_userspace.c +++ b/boards/arm/imxrt/teensy-4.x/kernel/imxrt_userspace.c @@ -26,7 +26,7 @@ #include -#include +#include #include #include diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/lpc17_40_userspace.c b/boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/lpc17_40_userspace.c index 32c9a6cb1a5..0214b2b9048 100644 --- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/lpc17_40_userspace.c +++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/kernel/lpc17_40_userspace.c @@ -26,7 +26,7 @@ #include -#include +#include #include #include diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/lpc17_40_userspace.c b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/lpc17_40_userspace.c index cc7dc0496d2..f8bbf062cf5 100644 --- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/lpc17_40_userspace.c +++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/kernel/lpc17_40_userspace.c @@ -26,7 +26,7 @@ #include -#include +#include #include #include diff --git a/boards/arm/lpc17xx_40xx/open1788/kernel/lpc17_40_userspace.c b/boards/arm/lpc17xx_40xx/open1788/kernel/lpc17_40_userspace.c index 5232a63fe5c..155659881ce 100644 --- a/boards/arm/lpc17xx_40xx/open1788/kernel/lpc17_40_userspace.c +++ b/boards/arm/lpc17xx_40xx/open1788/kernel/lpc17_40_userspace.c @@ -26,7 +26,7 @@ #include -#include +#include #include #include diff --git a/boards/arm/lpc17xx_40xx/pnev5180b/kernel/lpc17_40_userspace.c b/boards/arm/lpc17xx_40xx/pnev5180b/kernel/lpc17_40_userspace.c index e540c3b5dcc..0caf83347c4 100644 --- a/boards/arm/lpc17xx_40xx/pnev5180b/kernel/lpc17_40_userspace.c +++ b/boards/arm/lpc17xx_40xx/pnev5180b/kernel/lpc17_40_userspace.c @@ -26,7 +26,7 @@ #include -#include +#include #include #include diff --git a/boards/arm/mps/mps2-an500/kernel/mps_userspace.c b/boards/arm/mps/mps2-an500/kernel/mps_userspace.c index f4de8d9c1dd..715c2c06a6e 100644 --- a/boards/arm/mps/mps2-an500/kernel/mps_userspace.c +++ b/boards/arm/mps/mps2-an500/kernel/mps_userspace.c @@ -26,7 +26,7 @@ #include -#include +#include #include #include diff --git a/boards/arm/s32k3xx/mr-canhubk3/kernel/s32k3xx_userspace.c b/boards/arm/s32k3xx/mr-canhubk3/kernel/s32k3xx_userspace.c index 5979f18a867..0d113201094 100644 --- a/boards/arm/s32k3xx/mr-canhubk3/kernel/s32k3xx_userspace.c +++ b/boards/arm/s32k3xx/mr-canhubk3/kernel/s32k3xx_userspace.c @@ -26,7 +26,7 @@ #include -#include +#include #include #include diff --git a/boards/arm/sam34/sam3u-ek/kernel/sam_userspace.c b/boards/arm/sam34/sam3u-ek/kernel/sam_userspace.c index e6176e2b206..46ae5fa6175 100644 --- a/boards/arm/sam34/sam3u-ek/kernel/sam_userspace.c +++ b/boards/arm/sam34/sam3u-ek/kernel/sam_userspace.c @@ -26,7 +26,7 @@ #include -#include +#include #include #include diff --git a/boards/arm/samv7/same70-qmtech/kernel/sam_userspace.c b/boards/arm/samv7/same70-qmtech/kernel/sam_userspace.c index 24e8f62b007..d4960e2abe5 100644 --- a/boards/arm/samv7/same70-qmtech/kernel/sam_userspace.c +++ b/boards/arm/samv7/same70-qmtech/kernel/sam_userspace.c @@ -26,7 +26,7 @@ #include -#include +#include #include #include diff --git a/boards/arm/samv7/same70-xplained/kernel/sam_userspace.c b/boards/arm/samv7/same70-xplained/kernel/sam_userspace.c index 3d9ec313edd..9b8652d55fb 100644 --- a/boards/arm/samv7/same70-xplained/kernel/sam_userspace.c +++ b/boards/arm/samv7/same70-xplained/kernel/sam_userspace.c @@ -26,7 +26,7 @@ #include -#include +#include #include #include diff --git a/boards/arm/samv7/samv71-xult/kernel/sam_userspace.c b/boards/arm/samv7/samv71-xult/kernel/sam_userspace.c index 58af2e3c04a..8d77f415c8a 100644 --- a/boards/arm/samv7/samv71-xult/kernel/sam_userspace.c +++ b/boards/arm/samv7/samv71-xult/kernel/sam_userspace.c @@ -26,7 +26,7 @@ #include -#include +#include #include #include diff --git a/boards/arm/stm32/mikroe-stm32f4/kernel/stm32_userspace.c b/boards/arm/stm32/mikroe-stm32f4/kernel/stm32_userspace.c index 9fa444c201d..9526679013d 100644 --- a/boards/arm/stm32/mikroe-stm32f4/kernel/stm32_userspace.c +++ b/boards/arm/stm32/mikroe-stm32f4/kernel/stm32_userspace.c @@ -26,7 +26,7 @@ #include -#include +#include #include #include diff --git a/boards/arm/stm32/stm3240g-eval/kernel/stm32_userspace.c b/boards/arm/stm32/stm3240g-eval/kernel/stm32_userspace.c index 95772dfab76..b4610bbb353 100644 --- a/boards/arm/stm32/stm3240g-eval/kernel/stm32_userspace.c +++ b/boards/arm/stm32/stm3240g-eval/kernel/stm32_userspace.c @@ -26,7 +26,7 @@ #include -#include +#include #include #include diff --git a/crypto/cryptosoft.c b/crypto/cryptosoft.c index f9aa1e53472..61fa4b34aae 100644 --- a/crypto/cryptosoft.c +++ b/crypto/cryptosoft.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include diff --git a/drivers/audio/audio_dma.c b/drivers/audio/audio_dma.c index 4a03d830432..ce308e8935d 100644 --- a/drivers/audio/audio_dma.c +++ b/drivers/audio/audio_dma.c @@ -23,6 +23,8 @@ ****************************************************************************/ #include +#include +#include #include #include #include diff --git a/drivers/input/goldfish_events.c b/drivers/input/goldfish_events.c index f7885a5bf1d..f52503d5c82 100644 --- a/drivers/input/goldfish_events.c +++ b/drivers/input/goldfish_events.c @@ -24,6 +24,7 @@ #include +#include #include #include #include diff --git a/drivers/input/mouse_upper.c b/drivers/input/mouse_upper.c index 22caee8702b..dc1b61baef8 100644 --- a/drivers/input/mouse_upper.c +++ b/drivers/input/mouse_upper.c @@ -29,6 +29,7 @@ #include #include +#include #include #include #include diff --git a/drivers/lcd/pcf8574_lcd_backpack.c b/drivers/lcd/pcf8574_lcd_backpack.c index 62f31a18fab..254648a7c28 100644 --- a/drivers/lcd/pcf8574_lcd_backpack.c +++ b/drivers/lcd/pcf8574_lcd_backpack.c @@ -29,6 +29,7 @@ #include #include +#include #include #include #include diff --git a/drivers/misc/goldfish_pipe.c b/drivers/misc/goldfish_pipe.c index 7482b011a13..5070c4bb388 100644 --- a/drivers/misc/goldfish_pipe.c +++ b/drivers/misc/goldfish_pipe.c @@ -43,6 +43,7 @@ #include #include +#include #include #include #include diff --git a/drivers/misc/mkrd.c b/drivers/misc/mkrd.c index d80cfd59707..bf2f69ba307 100644 --- a/drivers/misc/mkrd.c +++ b/drivers/misc/mkrd.c @@ -24,6 +24,7 @@ #include +#include #include #include #include diff --git a/drivers/misc/optee.c b/drivers/misc/optee.c index b934a2097d4..6eb13d43b51 100644 --- a/drivers/misc/optee.c +++ b/drivers/misc/optee.c @@ -27,6 +27,8 @@ #include #include #include +#include +#include #include #include #include diff --git a/drivers/mtd/gd25.c b/drivers/mtd/gd25.c index c19646fb2f4..61248615f69 100644 --- a/drivers/mtd/gd25.c +++ b/drivers/mtd/gd25.c @@ -35,6 +35,7 @@ #include #include +#include #include #include #include diff --git a/drivers/mtd/mtd_rwbuffer.c b/drivers/mtd/mtd_rwbuffer.c index 7b76b605adb..88e865e915f 100644 --- a/drivers/mtd/mtd_rwbuffer.c +++ b/drivers/mtd/mtd_rwbuffer.c @@ -41,6 +41,7 @@ #include #include +#include #include #include diff --git a/drivers/mtd/rammtd.c b/drivers/mtd/rammtd.c index 264b340fc1c..faae742a234 100644 --- a/drivers/mtd/rammtd.c +++ b/drivers/mtd/rammtd.c @@ -31,6 +31,7 @@ #include #include +#include #include #include #include diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index c0b9abaeced..54da2c6cb0f 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -28,6 +28,7 @@ #include #include +#include #include #include #include diff --git a/drivers/net/igc.c b/drivers/net/igc.c index 86df0079524..1dbaec901ef 100644 --- a/drivers/net/igc.c +++ b/drivers/net/igc.c @@ -28,6 +28,7 @@ #include #include +#include #include #include #include diff --git a/drivers/pci/pci_ivshmem.c b/drivers/pci/pci_ivshmem.c index e2d04d546ee..2a0d7eb84e0 100644 --- a/drivers/pci/pci_ivshmem.c +++ b/drivers/pci/pci_ivshmem.c @@ -29,6 +29,7 @@ #include #include +#include #include #include #include diff --git a/drivers/pipes/pipe_common.c b/drivers/pipes/pipe_common.c index fd9a085b347..f84b39711ef 100644 --- a/drivers/pipes/pipe_common.c +++ b/drivers/pipes/pipe_common.c @@ -38,6 +38,7 @@ #include #include +#include #include #include #include diff --git a/drivers/power/battery/goldfish_battery.c b/drivers/power/battery/goldfish_battery.c index fbec7bba24c..3b51ad9f7a4 100644 --- a/drivers/power/battery/goldfish_battery.c +++ b/drivers/power/battery/goldfish_battery.c @@ -25,8 +25,10 @@ #include #include #include -#include + +#include #include +#include #include #include diff --git a/drivers/rc/lirc_dev.c b/drivers/rc/lirc_dev.c index 1aae5889325..994f65349d2 100644 --- a/drivers/rc/lirc_dev.c +++ b/drivers/rc/lirc_dev.c @@ -32,6 +32,7 @@ #include #include +#include #include #include #include diff --git a/drivers/sensors/bme680_uorb.c b/drivers/sensors/bme680_uorb.c index 14d6dcc00df..3879d289078 100644 --- a/drivers/sensors/bme680_uorb.c +++ b/drivers/sensors/bme680_uorb.c @@ -32,6 +32,7 @@ #include #include +#include #include #include #include diff --git a/drivers/sensors/bmp280_uorb.c b/drivers/sensors/bmp280_uorb.c index 8685e183c8e..1543a9e01a1 100644 --- a/drivers/sensors/bmp280_uorb.c +++ b/drivers/sensors/bmp280_uorb.c @@ -30,6 +30,7 @@ #include #include +#include #include #include #include diff --git a/drivers/sensors/ms56xx_uorb.c b/drivers/sensors/ms56xx_uorb.c index e93f9b7608f..a975dd24d17 100644 --- a/drivers/sensors/ms56xx_uorb.c +++ b/drivers/sensors/ms56xx_uorb.c @@ -31,6 +31,7 @@ #include #include +#include #include #include #include diff --git a/drivers/serial/uart_16550.c b/drivers/serial/uart_16550.c index 1547551815d..6adff69fcc8 100644 --- a/drivers/serial/uart_16550.c +++ b/drivers/serial/uart_16550.c @@ -35,6 +35,7 @@ #include #include +#include #include #include #include diff --git a/drivers/serial/uart_bth4.c b/drivers/serial/uart_bth4.c index 45b2098ea03..5c0b1b22be5 100644 --- a/drivers/serial/uart_bth4.c +++ b/drivers/serial/uart_bth4.c @@ -22,6 +22,7 @@ * Included Files ****************************************************************************/ +#include #include #include #include diff --git a/drivers/timers/pl031.c b/drivers/timers/pl031.c index 58c58d8bb5e..e2414540c5d 100644 --- a/drivers/timers/pl031.c +++ b/drivers/timers/pl031.c @@ -24,9 +24,12 @@ #include +#include + +#include +#include #include #include -#include /**************************************************************************** * Pre-processor Definitions diff --git a/drivers/usbdev/usbdev_fs.c b/drivers/usbdev/usbdev_fs.c index c6b334213ed..99646cab598 100644 --- a/drivers/usbdev/usbdev_fs.c +++ b/drivers/usbdev/usbdev_fs.c @@ -29,6 +29,7 @@ #include #include +#include #include #include #include diff --git a/drivers/video/fb.c b/drivers/video/fb.c index d17c36eafef..94c63cb1711 100644 --- a/drivers/video/fb.c +++ b/drivers/video/fb.c @@ -35,6 +35,7 @@ #include #include +#include #include #include #include diff --git a/drivers/video/mipidsi/mipi_dsi_host.c b/drivers/video/mipidsi/mipi_dsi_host.c index 547398852c1..b443a1560f8 100644 --- a/drivers/video/mipidsi/mipi_dsi_host.c +++ b/drivers/video/mipidsi/mipi_dsi_host.c @@ -24,6 +24,8 @@ #include +#include +#include #include #include diff --git a/drivers/video/v4l2_m2m.c b/drivers/video/v4l2_m2m.c index f08f61cadf8..951cc4ca4e7 100644 --- a/drivers/video/v4l2_m2m.c +++ b/drivers/video/v4l2_m2m.c @@ -27,6 +27,7 @@ #include #include +#include #include #include diff --git a/drivers/virtio/virtio-mmio.c b/drivers/virtio/virtio-mmio.c index c5fb423f280..efa62e13fdb 100644 --- a/drivers/virtio/virtio-mmio.c +++ b/drivers/virtio/virtio-mmio.c @@ -29,6 +29,7 @@ #include #include +#include #include #include diff --git a/drivers/virtio/virtio-pci.h b/drivers/virtio/virtio-pci.h index 67334f7b5e9..70d3c544e25 100644 --- a/drivers/virtio/virtio-pci.h +++ b/drivers/virtio/virtio-pci.h @@ -29,6 +29,7 @@ #ifdef CONFIG_DRIVERS_VIRTIO_PCI +#include #include #include #include diff --git a/drivers/wireless/bluetooth/bt_bridge.c b/drivers/wireless/bluetooth/bt_bridge.c index 6d11a6c0fcb..c694d4bf149 100644 --- a/drivers/wireless/bluetooth/bt_bridge.c +++ b/drivers/wireless/bluetooth/bt_bridge.c @@ -25,6 +25,7 @@ #include #include +#include #include #include #include diff --git a/fs/fs_heap.c b/fs/fs_heap.c index faacb034d63..cf956b8d018 100644 --- a/fs/fs_heap.c +++ b/fs/fs_heap.c @@ -22,6 +22,8 @@ * Included Files ****************************************************************************/ +#include + #include "fs_heap.h" #if defined(CONFIG_FS_HEAPSIZE) && CONFIG_FS_HEAPSIZE > 0 diff --git a/fs/mmap/fs_munmap.c b/fs/mmap/fs_munmap.c index 4d8b68bcd3d..e07fdf4469c 100644 --- a/fs/mmap/fs_munmap.c +++ b/fs/mmap/fs_munmap.c @@ -33,6 +33,7 @@ #include #include +#include #include #include "inode/inode.h" diff --git a/fs/procfs/fs_procfscritmon.c b/fs/procfs/fs_procfscritmon.c index 089738f5eae..741706797dd 100644 --- a/fs/procfs/fs_procfscritmon.c +++ b/fs/procfs/fs_procfscritmon.c @@ -42,6 +42,7 @@ #include #include #include +#include #include "fs_heap.h" diff --git a/fs/procfs/fs_procfsproc.c b/fs/procfs/fs_procfsproc.c index d1e2fd05285..f5dcabdc115 100644 --- a/fs/procfs/fs_procfsproc.c +++ b/fs/procfs/fs_procfsproc.c @@ -44,6 +44,7 @@ # include #endif +#include #include #include #include diff --git a/fs/procfs/fs_procfstcbinfo.c b/fs/procfs/fs_procfstcbinfo.c index 23cc918a3d7..e3253582733 100644 --- a/fs/procfs/fs_procfstcbinfo.c +++ b/fs/procfs/fs_procfstcbinfo.c @@ -36,6 +36,7 @@ #include #include +#include #include #include #include diff --git a/fs/shm/shmfs.c b/fs/shm/shmfs.c index 116a24caf28..0903750fd5e 100644 --- a/fs/shm/shmfs.c +++ b/fs/shm/shmfs.c @@ -26,12 +26,9 @@ #include #include - -#if defined (CONFIG_BUILD_KERNEL) #include #include #include -#endif #include "shm/shmfs.h" #include "inode/inode.h" diff --git a/fs/tmpfs/fs_tmpfs.c b/fs/tmpfs/fs_tmpfs.c index decc697bcd0..dfb675a3bee 100644 --- a/fs/tmpfs/fs_tmpfs.c +++ b/fs/tmpfs/fs_tmpfs.c @@ -33,6 +33,7 @@ #include #include +#include #include #include #include diff --git a/fs/vfs/fs_fstat.c b/fs/vfs/fs_fstat.c index 8e2099bedff..4fe8791223f 100644 --- a/fs/vfs/fs_fstat.c +++ b/fs/vfs/fs_fstat.c @@ -32,6 +32,7 @@ #include #include +#include #include "inode/inode.h" /**************************************************************************** diff --git a/fs/vfs/fs_open.c b/fs/vfs/fs_open.c index 5dee0ee5021..16644c893e7 100644 --- a/fs/vfs/fs_open.c +++ b/fs/vfs/fs_open.c @@ -33,6 +33,7 @@ #include #include +#include #include #include diff --git a/fs/vfs/fs_pseudofile.c b/fs/vfs/fs_pseudofile.c index a430b6dd258..1cfe0a9cf47 100644 --- a/fs/vfs/fs_pseudofile.c +++ b/fs/vfs/fs_pseudofile.c @@ -31,6 +31,7 @@ #include #include +#include #include #include #include diff --git a/fs/vfs/fs_sendfile.c b/fs/vfs/fs_sendfile.c index ed283a7416a..75eb1fe6666 100644 --- a/fs/vfs/fs_sendfile.c +++ b/fs/vfs/fs_sendfile.c @@ -29,6 +29,7 @@ #include #include +#include #include #include #include "fs_heap.h" diff --git a/fs/vfs/fs_timerfd.c b/fs/vfs/fs_timerfd.c index 42a5786208a..f5252caf19a 100644 --- a/fs/vfs/fs_timerfd.c +++ b/fs/vfs/fs_timerfd.c @@ -31,6 +31,7 @@ #include +#include #include #include diff --git a/include/nuttx/kmalloc.h b/include/nuttx/kmalloc.h index 2eefa61c791..0aca383d4ed 100644 --- a/include/nuttx/kmalloc.h +++ b/include/nuttx/kmalloc.h @@ -34,7 +34,10 @@ #include #include -#include + +#ifdef CONFIG_MM_KERNEL_HEAP +#include +#endif /**************************************************************************** * Public Types diff --git a/include/nuttx/net/snoop.h b/include/nuttx/net/snoop.h index d579c126856..69d0025ff5f 100644 --- a/include/nuttx/net/snoop.h +++ b/include/nuttx/net/snoop.h @@ -29,6 +29,7 @@ #include +#include #include #include diff --git a/include/nuttx/notifier.h b/include/nuttx/notifier.h index eb67b378090..87ebdb78abc 100644 --- a/include/nuttx/notifier.h +++ b/include/nuttx/notifier.h @@ -30,6 +30,7 @@ #include #include #include +#include #include #include diff --git a/include/nuttx/pci/pci_ivshmem.h b/include/nuttx/pci/pci_ivshmem.h index 07251a4c455..fad7a54a16a 100644 --- a/include/nuttx/pci/pci_ivshmem.h +++ b/include/nuttx/pci/pci_ivshmem.h @@ -31,6 +31,7 @@ #ifdef CONFIG_PCI_IVSHMEM +#include #include /**************************************************************************** diff --git a/include/nuttx/userspace.h b/include/nuttx/userspace.h index 59285ac9605..2166c89e680 100644 --- a/include/nuttx/userspace.h +++ b/include/nuttx/userspace.h @@ -34,8 +34,6 @@ #include #include -#include - #ifdef CONFIG_BUILD_PROTECTED /**************************************************************************** diff --git a/include/sys/socket.h b/include/sys/socket.h index fc604bde209..3d5cf1fee17 100644 --- a/include/sys/socket.h +++ b/include/sys/socket.h @@ -389,7 +389,7 @@ struct ucred ****************************************************************************/ static inline FAR struct cmsghdr *__cmsg_nxthdr(FAR void *__ctl, - unsigned int __size, + unsigned long __size, FAR struct cmsghdr *__cmsg) { size_t len = CMSG_ALIGN(__cmsg->cmsg_len); diff --git a/include/syslog.h b/include/syslog.h index 37e4487c2fb..66936e034d7 100644 --- a/include/syslog.h +++ b/include/syslog.h @@ -29,6 +29,7 @@ #include #include + #ifdef CONFIG_SYSLOG_TO_SCHED_NOTE #include #endif diff --git a/libs/libc/misc/lib_cxx_initialize.c b/libs/libc/misc/lib_cxx_initialize.c index 0d7aaaaa080..4db113fcd10 100644 --- a/libs/libc/misc/lib_cxx_initialize.c +++ b/libs/libc/misc/lib_cxx_initialize.c @@ -25,6 +25,7 @@ ****************************************************************************/ #include +#include #include #include diff --git a/libs/libc/modlib/modlib_bind.c b/libs/libc/modlib/modlib_bind.c index 8ae64a71382..938bd5d611f 100644 --- a/libs/libc/modlib/modlib_bind.c +++ b/libs/libc/modlib/modlib_bind.c @@ -32,6 +32,7 @@ #include #include +#include #include #include diff --git a/libs/libc/modlib/modlib_load.c b/libs/libc/modlib/modlib_load.c index cb3faa7b1eb..98e7690c820 100644 --- a/libs/libc/modlib/modlib_load.c +++ b/libs/libc/modlib/modlib_load.c @@ -38,6 +38,7 @@ #include #include +#include #include #include diff --git a/libs/libc/modlib/modlib_unload.c b/libs/libc/modlib/modlib_unload.c index dd1c913c936..252390b0306 100644 --- a/libs/libc/modlib/modlib_unload.c +++ b/libs/libc/modlib/modlib_unload.c @@ -29,6 +29,7 @@ #include #include +#include #include #include "libc.h" diff --git a/libs/libc/stdio/lib_freopen.c b/libs/libc/stdio/lib_freopen.c index cefb5660e20..2297bfbdc06 100644 --- a/libs/libc/stdio/lib_freopen.c +++ b/libs/libc/stdio/lib_freopen.c @@ -29,6 +29,7 @@ #include #include #include +#include #include "libc.h" diff --git a/libs/libc/time/lib_localtime.c b/libs/libc/time/lib_localtime.c index 8be9d17258b..8dd6f5f3d27 100644 --- a/libs/libc/time/lib_localtime.c +++ b/libs/libc/time/lib_localtime.c @@ -53,7 +53,7 @@ #include -#include +#include #include #include #include diff --git a/mm/umm_heap/umm_calloc.c b/mm/umm_heap/umm_calloc.c index 3c16fa56dbd..7c782c97909 100644 --- a/mm/umm_heap/umm_calloc.c +++ b/mm/umm_heap/umm_calloc.c @@ -26,6 +26,7 @@ #include +#include #include #include diff --git a/mm/umm_heap/umm_heap.h b/mm/umm_heap/umm_heap.h index 2e23941e8de..c2b5de12c18 100644 --- a/mm/umm_heap/umm_heap.h +++ b/mm/umm_heap/umm_heap.h @@ -29,6 +29,7 @@ #include +#include #include /**************************************************************************** diff --git a/mm/umm_heap/umm_initialize.c b/mm/umm_heap/umm_initialize.c index 9ddd8f89339..f38db4a852c 100644 --- a/mm/umm_heap/umm_initialize.c +++ b/mm/umm_heap/umm_initialize.c @@ -28,6 +28,7 @@ #include +#include #include #include "umm_heap/umm_heap.h" diff --git a/mm/umm_heap/umm_sbrk.c b/mm/umm_heap/umm_sbrk.c index 351e0e77613..5d338b5f431 100644 --- a/mm/umm_heap/umm_sbrk.c +++ b/mm/umm_heap/umm_sbrk.c @@ -32,6 +32,7 @@ #include #include +#include #include #include "umm_heap/umm_heap.h" diff --git a/net/local/local_conn.c b/net/local/local_conn.c index 165dc12a3fe..7635bc932ad 100644 --- a/net/local/local_conn.c +++ b/net/local/local_conn.c @@ -32,6 +32,7 @@ #include #include +#include #include #include diff --git a/net/netlink/netlink_sockif.c b/net/netlink/netlink_sockif.c index f5d6b112dd6..5ce00c75861 100644 --- a/net/netlink/netlink_sockif.c +++ b/net/netlink/netlink_sockif.c @@ -36,6 +36,7 @@ #include #include +#include #include #include #include diff --git a/net/socket/socket.h b/net/socket/socket.h index 89f15284b75..d05c66c83be 100644 --- a/net/socket/socket.h +++ b/net/socket/socket.h @@ -34,6 +34,7 @@ #include #include +#include #include #include diff --git a/net/socket/socketpair.c b/net/socket/socketpair.c index 59824630e88..57ec6d42163 100644 --- a/net/socket/socketpair.c +++ b/net/socket/socketpair.c @@ -33,6 +33,7 @@ #include #include +#include #include #include diff --git a/net/utils/net_snoop.c b/net/utils/net_snoop.c index 38c16c9ff43..dd234c6a19f 100644 --- a/net/utils/net_snoop.c +++ b/net/utils/net_snoop.c @@ -35,6 +35,7 @@ #include #include +#include #include /**************************************************************************** diff --git a/sched/misc/reboot_notifier.c b/sched/misc/reboot_notifier.c index 9f77a0088d3..e1f2cfab46d 100644 --- a/sched/misc/reboot_notifier.c +++ b/sched/misc/reboot_notifier.c @@ -25,6 +25,7 @@ ****************************************************************************/ #include +#include #include #include diff --git a/sched/signal/sig_findaction.c b/sched/signal/sig_findaction.c index 42fa092ed8c..fc519232f7e 100644 --- a/sched/signal/sig_findaction.c +++ b/sched/signal/sig_findaction.c @@ -26,7 +26,9 @@ #include +#include #include + #include "signal/signal.h" /**************************************************************************** diff --git a/sched/signal/signal.h b/sched/signal/signal.h index 7fef91d116d..c43c793c4aa 100644 --- a/sched/signal/signal.h +++ b/sched/signal/signal.h @@ -33,6 +33,7 @@ #include #include +#include #include #include diff --git a/sched/wqueue/kwork_notifier.c b/sched/wqueue/kwork_notifier.c index 37bb6d16f10..f915cfa3e72 100644 --- a/sched/wqueue/kwork_notifier.c +++ b/sched/wqueue/kwork_notifier.c @@ -34,6 +34,7 @@ #include #include +#include #include #include diff --git a/wireless/ieee802154/ieee802154_primitive.c b/wireless/ieee802154/ieee802154_primitive.c index dd23265424f..f718928aea9 100644 --- a/wireless/ieee802154/ieee802154_primitive.c +++ b/wireless/ieee802154/ieee802154_primitive.c @@ -31,6 +31,7 @@ #include #include +#include #include #include