Remove os_internal.h it has been replace by several new header files under sched/. There have been some sneak inclusion paths via os_internal.h, so expect a few compilation errors for some architectures

arch/8051/src/up_allocateheap.c

@@ -46,7 +46,6 @@
 #include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
 
-#include "os_internal.h"
 #include "up_internal.h"
 #include "up_mem.h"
 

arch/arm/src/a1x/a1x_irq.c

@@ -48,7 +48,6 @@
 #include <arch/irq.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 #include "sctlr.h"
 

arch/arm/src/a1x/a1x_serial.c

@@ -59,7 +59,6 @@
 #include <arch/board/board.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #include "chip.h"

arch/arm/src/arm/up_copyfullstate.c

@@ -40,8 +40,8 @@
 #include <nuttx/config.h>
 
 #include <stdint.h>
+#include <arch/irq.h>
 
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************

arch/arm/src/arm/up_doirq.c

@@ -47,7 +47,6 @@
 #include <arch/board/board.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************

arch/arm/src/arm/up_syscall.c

@@ -42,8 +42,9 @@
 #include <stdint.h>
 #include <debug.h>
 
+#include <arch/irq.h>
+
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************

arch/arm/src/arm/up_undefinedinsn.c

@@ -38,10 +38,13 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
+
 #include <stdint.h>
+#include <assert.h>
 #include <debug.h>
 
-#include "os_internal.h"
+#include <arch/irq.h>
+
 #include "up_internal.h"
 
 /****************************************************************************

arch/arm/src/armv6-m/up_copyfullstate.c

@@ -40,8 +40,8 @@
 #include <nuttx/config.h>
 
 #include <stdint.h>
+#include <arch/irq.h>
 
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************

arch/arm/src/armv6-m/up_doirq.c

@@ -47,7 +47,6 @@
 #include <arch/board/board.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************

arch/arm/src/armv6-m/up_hardfault.c

@@ -47,7 +47,6 @@
 #include <arch/irq.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "nvic.h"
 #include "up_internal.h"
 

arch/arm/src/armv6-m/up_svcall.c

@@ -53,7 +53,6 @@
 
 #include "svcall.h"
 #include "exc_return.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************

arch/arm/src/armv7-a/arm_copyarmstate.c

@@ -41,7 +41,8 @@
 
 #include <stdint.h>
 
-#include "os_internal.h"
+#include <arch/irq.h>
+
 #include "up_internal.h"
 
 #ifdef CONFIG_ARCH_FPU

arch/arm/src/armv7-a/arm_copyfullstate.c

@@ -40,8 +40,8 @@
 #include <nuttx/config.h>
 
 #include <stdint.h>
+#include <arch/irq.h>
 
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************

arch/arm/src/armv7-a/arm_doirq.c

@@ -47,7 +47,6 @@
 #include <arch/board/board.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************

arch/arm/src/armv7-a/arm_syscall.c

@@ -42,8 +42,9 @@
 #include <stdint.h>
 #include <debug.h>
 
+#include <arch/irq.h>
+
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************

arch/arm/src/armv7-a/arm_undefinedinsn.c

@@ -38,10 +38,13 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
+
 #include <stdint.h>
+#include <assert.h>
 #include <debug.h>
 
-#include "os_internal.h"
+#include <arch/irq.h>
+
 #include "up_internal.h"
 
 /****************************************************************************

arch/arm/src/armv7-m/up_copyarmstate.c

@@ -41,7 +41,8 @@
 
 #include <stdint.h>
 
-#include "os_internal.h"
+#include <arch/irq.h>
+
 #include "up_internal.h"
 
 #if defined(CONFIG_ARCH_FPU) && !defined(CONFIG_ARMV7M_CMNVECTOR)

arch/arm/src/armv7-m/up_copyfullstate.c

@@ -40,8 +40,8 @@
 #include <nuttx/config.h>
 
 #include <stdint.h>
+#include <arch/irq.h>
 
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************

arch/arm/src/armv7-m/up_doirq.c

@@ -47,7 +47,6 @@
 #include <arch/board/board.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************

arch/arm/src/armv7-m/up_hardfault.c

@@ -48,7 +48,6 @@
 #include <arch/irq.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "nvic.h"
 #include "up_internal.h"
 

arch/arm/src/armv7-m/up_memfault.c

@@ -45,7 +45,6 @@
 #include <arch/irq.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "nvic.h"
 #include "up_internal.h"
 

arch/arm/src/armv7-m/up_svcall.c

@@ -53,7 +53,6 @@
 
 #include "svcall.h"
 #include "exc_return.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************

arch/arm/src/c5471/c5471_irq.c

@@ -45,7 +45,6 @@
 #include "arm.h"
 #include "chip.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************

arch/arm/src/c5471/c5471_serial.c

@@ -55,7 +55,6 @@
 
 #include "chip.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************

arch/arm/src/calypso/calypso_serial.c

@@ -59,7 +59,6 @@
 
 #include "chip.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************

arch/arm/src/common/up_releasestack.c

@@ -41,9 +41,10 @@
 
 #include <sched.h>
 #include <debug.h>
-#include <nuttx/arch.h>
 
-#include "os_internal.h"
+#include <nuttx/arch.h>
+#include <nuttx/kmalloc.h>
+
 #include "up_internal.h"
 
 /****************************************************************************

arch/arm/src/dm320/dm320_decodeirq.c

@@ -48,7 +48,6 @@
 
 #include "chip.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /********************************************************************************

arch/arm/src/dm320/dm320_irq.c

@@ -46,7 +46,6 @@
 #include "chip.h"
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /************************************************************************

arch/arm/src/dm320/dm320_serial.c

@@ -57,7 +57,6 @@
 
 #include "chip.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #ifdef USE_SERIALDRIVER

arch/arm/src/imx/imx_decodeirq.c

@@ -48,7 +48,6 @@
 
 #include "chip.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /********************************************************************************

arch/arm/src/imx/imx_irq.c

@@ -45,7 +45,6 @@
 
 #include "chip.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************

arch/arm/src/imx/imx_serial.c

@@ -58,7 +58,6 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "imx_gpio.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #ifdef USE_SERIALDRIVER

arch/arm/src/kinetis/kinetis_irq.c

@@ -49,7 +49,6 @@
 #include "nvic.h"
 #include "ram_vectors.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 #include "kinetis_internal.h"
 

arch/arm/src/kinetis/kinetis_serial.c

@@ -56,7 +56,6 @@
 
 #include "up_arch.h"
 #include "up_internal.h"
-#include "os_internal.h"
 
 #include "kinetis_config.h"
 #include "chip.h"

arch/arm/src/kl/kl_irq.c

@@ -48,7 +48,6 @@
 
 #include "nvic.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #include "kl_irq.h"

arch/arm/src/kl/kl_serial.c

@@ -56,7 +56,6 @@
 
 #include "up_arch.h"
 #include "up_internal.h"
-#include "os_internal.h"
 
 #include "kl_config.h"
 #include "kl_lowputc.h"

arch/arm/src/lpc17xx/lpc17_i2c.c

@@ -64,7 +64,6 @@
 
 #include "up_arch.h"
 #include "up_internal.h"
-#include "os_internal.h"
 
 #include "chip.h"
 #include "chip/lpc17_syscon.h"

arch/arm/src/lpc17xx/lpc17_irq.c

@@ -49,7 +49,6 @@
 #include "nvic.h"
 #include "ram_vectors.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #include "lpc17_gpio.h"

arch/arm/src/lpc17xx/lpc17_serial.c

@@ -59,7 +59,6 @@
 #include <arch/board/board.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #include "chip.h"

arch/arm/src/lpc214x/lpc214x_decodeirq.c

@@ -47,7 +47,6 @@
 
 #include "chip.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #include "lpc214x_vic.h"

arch/arm/src/lpc214x/lpc214x_irq.c

@@ -46,7 +46,6 @@
 #include "arm.h"
 #include "chip.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #include "lpc214x_vic.h"

arch/arm/src/lpc214x/lpc214x_serial.c

@@ -54,7 +54,6 @@
 
 #include "chip.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #include "lpc214x_pinsel.h"

arch/arm/src/lpc214x/lpc214x_timerisr.c

@@ -140,7 +140,6 @@ void up_timer_initialize(void)
   tmr_putreg32(0, LPC214X_TMR_PR_OFFSET);
 
   /* Set timer match registger to get a TICK_PER_SEC rate
-   * See arch/board.h and sched/os_internal.h
    */
 
   tmr_putreg32(LPC214X_PCLKFREQ/TICK_PER_SEC, LPC214X_TMR_MR0_OFFSET);

arch/arm/src/lpc2378/lpc23xx_decodeirq.c

@@ -54,7 +54,6 @@
 #include <arch/board/board.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "internal.h"
 #include "lpc23xx_vic.h"
 

arch/arm/src/lpc2378/lpc23xx_i2c.c

@@ -70,7 +70,6 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "os_internal.h"
 
 #include "lpc23xx_pinsel.h"
 #include "lpc23xx_scb.h"

arch/arm/src/lpc2378/lpc23xx_irq.c

@@ -52,7 +52,6 @@
 #include "arm.h"
 #include "chip.h"
 #include "up_arch.h"
-#include "os_internal.h"
 
 #include "internal.h"
 #include "lpc23xx_vic.h"

arch/arm/src/lpc2378/lpc23xx_serial.c

@@ -60,7 +60,6 @@
 
 #include "chip.h"
 #include "up_arch.h"
-#include "os_internal.h"
 
 #include "internal.h"
 #include "lpc23xx_scb.h"

arch/arm/src/lpc2378/lpc23xx_timerisr.c

@@ -172,7 +172,6 @@ void up_timer_initialize(void)
   tmr_putreg32(0, TMR_PC_OFFSET);
 
   /* Set timer match register to get a TICK_PER_SEC rate See arch/board.h and
-   * sched/os_internal.h
    */
 
   tmr_putreg32(T0_TICKS_COUNT, TMR_MR0_OFFSET); /* 10ms Intterrupt */

arch/arm/src/lpc31xx/lpc31_decodeirq.c

@@ -49,7 +49,6 @@
 #include "chip.h"
 #include "up_arch.h"
 
-#include "os_internal.h"
 #include "up_internal.h"
 
 #include "lpc31_intc.h"

arch/arm/src/lpc31xx/lpc31_irq.c

@@ -49,7 +49,6 @@
 
 #include "arm.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #include "lpc31_intc.h"

arch/arm/src/lpc31xx/lpc31_serial.c

@@ -54,7 +54,6 @@
 #include <arch/serial.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #include "lpc31_cgudrvr.h"

arch/arm/src/lpc43xx/lpc43_i2c.c

@@ -70,7 +70,6 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "os_internal.h"
 
 #include "lpc43_syscon.h"
 #include "lpc43_pinconn.h"

arch/arm/src/lpc43xx/lpc43_irq.c

@@ -50,7 +50,6 @@
 #include "nvic.h"
 #include "ram_vectors.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #include "lpc43_irq.h"

arch/arm/src/lpc43xx/lpc43_serial.c

@@ -61,7 +61,6 @@
 
 #include "chip.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #include "lpc43_config.h"

arch/arm/src/nuc1xx/nuc_irq.c

@@ -48,7 +48,6 @@
 
 #include "nvic.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #include "nuc_irq.h"

arch/arm/src/nuc1xx/nuc_serial.c

@@ -60,7 +60,6 @@
 #include <arch/board/board.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #include "chip.h"

arch/arm/src/sam34/sam_irq.c

@@ -49,7 +49,6 @@
 #include "nvic.h"
 #include "ram_vectors.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #ifdef CONFIG_SAM34_GPIO_IRQ

arch/arm/src/sam34/sam_serial.c

@@ -57,7 +57,6 @@
 
 #include "up_arch.h"
 #include "up_internal.h"
-#include "os_internal.h"
 
 #include "chip.h"
 

arch/arm/src/sama5/sam_can.c

@@ -65,7 +65,6 @@
 #include "up_internal.h"
 #include "up_arch.h"
 
-#include "os_internal.h"
 
 #include "chip/sam_pinmap.h"
 #include "sam_periphclks.h"

arch/arm/src/sama5/sam_dbgu.c

@@ -57,7 +57,6 @@
 
 #include "up_arch.h"
 #include "up_internal.h"
-#include "os_internal.h"
 
 #include "chip.h"
 #include "chip/sam_dbgu.h"

arch/arm/src/sama5/sam_irq.c

@@ -47,7 +47,6 @@
 #include <arch/irq.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #ifdef CONFIG_SAMA5_PIO_IRQ

arch/arm/src/sama5/sam_serial.c

@@ -57,7 +57,6 @@
 
 #include "up_arch.h"
 #include "up_internal.h"
-#include "os_internal.h"
 
 #include "chip.h"
 #include "chip/sam_uart.h"

arch/arm/src/samd/sam_irq.c

@@ -48,7 +48,6 @@
 
 #include "nvic.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #include "sam_irq.h"

arch/arm/src/samd/sam_serial.c

@@ -57,7 +57,6 @@
 
 #include "up_arch.h"
 #include "up_internal.h"
-#include "os_internal.h"
 
 #include "chip.h"
 #include "sam_config.h"

arch/arm/src/stm32/stm32_can.c

@@ -54,7 +54,6 @@
 #include "up_internal.h"
 #include "up_arch.h"
 
-#include "os_internal.h"
 
 #include "chip.h"
 #include "stm32.h"

arch/arm/src/stm32/stm32_irq.c

@@ -50,7 +50,6 @@
 #include "nvic.h"
 #include "ram_vectors.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 #include "stm32.h"
 

arch/arm/src/stm32/stm32_serial.c

@@ -66,7 +66,6 @@
 #include "stm32_rcc.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "os_internal.h"
 
 /****************************************************************************
  * Definitions

arch/arm/src/str71x/str71x_decodeirq.c

@@ -49,7 +49,6 @@
 
 #include "chip.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /********************************************************************************

arch/arm/src/str71x/str71x_serial.c

@@ -55,7 +55,6 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "os_internal.h"
 
 #include "str71x_internal.h"
 

arch/arm/src/str71x/str71x_xti.c

@@ -50,7 +50,6 @@
 
 #include "chip.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 #include "str71x_internal.h"
 

arch/arm/src/tiva/tiva_gpio.c

@@ -48,7 +48,6 @@
 #include <arch/irq.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "tiva_gpio.h"
 
 /****************************************************************************

arch/arm/src/tiva/tiva_gpioirq.c

@@ -47,7 +47,6 @@
 #include <arch/irq.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "irq/irq.h"
 
 #include "tiva_gpio.h"

arch/arm/src/tiva/tiva_irq.c

@@ -49,7 +49,6 @@
 #include "nvic.h"
 #include "ram_vectors.h"
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #include "chip.h"

arch/arm/src/tiva/tiva_serial.c

@@ -58,7 +58,6 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "os_internal.h"
 
 #include "tiva_lowputc.h"
 

arch/avr/src/at32uc3/at32uc3_gpioirq.c

@@ -50,7 +50,6 @@
 #include <arch/irq.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "irq/irq.h"
 #include "at32uc3_internal.h"
 #include "at32uc3_gpio.h"

arch/avr/src/at32uc3/at32uc3_irq.c

@@ -50,7 +50,6 @@
 #include <arch/irq.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 #include "at32uc3_internal.h"
 

arch/avr/src/at32uc3/at32uc3_serial.c

@@ -59,7 +59,6 @@
 #include "at32uc3_usart.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "os_internal.h"
 #include "at32uc3_internal.h"
 
 /****************************************************************************

arch/avr/src/at90usb/at90usb_serial.c

@@ -58,7 +58,6 @@
 
 #include "up_arch.h"
 #include "up_internal.h"
-#include "os_internal.h"
 #include "at90usb_internal.h"
 
 /****************************************************************************

arch/avr/src/atmega/atmega_serial.c

@@ -58,7 +58,6 @@
 
 #include "up_arch.h"
 #include "up_internal.h"
-#include "os_internal.h"
 #include "atmega_internal.h"
 
 /****************************************************************************

arch/avr/src/avr/up_doirq.c

@@ -47,7 +47,6 @@
 #include <arch/board/board.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************

arch/avr/src/avr/up_irq.c

@@ -49,7 +49,6 @@
 #include <avr/io.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************

arch/avr/src/avr32/up_doirq.c

@@ -47,7 +47,6 @@
 #include <arch/board/board.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************

arch/avr/src/common/up_releasestack.c

@@ -41,9 +41,10 @@
 
 #include <sched.h>
 #include <debug.h>
-#include <nuttx/arch.h>
 
-#include "os_internal.h"
+#include <nuttx/arch.h>
+#include <nuttx/kmalloc.h>
+
 #include "up_internal.h"
 
 /****************************************************************************

arch/hc/src/common/up_copystate.c

@@ -40,8 +40,8 @@
 #include <nuttx/config.h>
 
 #include <stdint.h>
+#include <arch/irq.h>
 
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************

arch/hc/src/common/up_doirq.c

@@ -47,7 +47,6 @@
 #include <arch/board/board.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************

arch/hc/src/common/up_releasestack.c

@@ -43,8 +43,8 @@
 #include <debug.h>
 
 #include <nuttx/arch.h>
+#include <nuttx/kmalloc.h>
 
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************

arch/hc/src/m9s12/m9s12_irq.c

@@ -48,7 +48,6 @@
 #include <arch/irq.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 #include "m9s12_internal.h"
 

arch/mips/src/common/up_releasestack.c

@@ -41,9 +41,10 @@
 
 #include <sched.h>
 #include <debug.h>
-#include <nuttx/arch.h>
 
-#include "os_internal.h"
+#include <nuttx/arch.h>
+#include <nuttx/kmalloc.h>
+
 #include "up_internal.h"
 
 /****************************************************************************

arch/mips/src/mips32/up_copystate.c

@@ -40,8 +40,8 @@
 #include <nuttx/config.h>
 
 #include <stdint.h>
+#include <arch/irq.h>
 
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************

arch/mips/src/mips32/up_doirq.c

@@ -47,7 +47,6 @@
 #include <arch/board/board.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************

arch/mips/src/pic32mx/pic32mx-decodeirq.c

@@ -49,7 +49,6 @@
 #include <arch/board/board.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 
 #include "pic32mx-int.h"
 #include "pic32mx-internal.h"

arch/mips/src/pic32mx/pic32mx-exception.c

@@ -50,7 +50,6 @@
 #include <arch/pic32mx/cp0.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 
 #include "pic32mx-int.h"
 #include "pic32mx-internal.h"

arch/mips/src/pic32mx/pic32mx-irq.c

@@ -51,7 +51,6 @@
 #include <arch/pic32mx/cp0.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 #include "pic32mx-int.h"

arch/mips/src/pic32mx/pic32mx-serial.c

@@ -60,7 +60,6 @@
 
 #include "up_arch.h"
 #include "up_internal.h"
-#include "os_internal.h"
 
 #include "pic32mx-config.h"
 #include "chip.h"

arch/rgmp/src/arm/arch_nuttx.c

@@ -42,7 +42,6 @@
 
 #include <arch/arch.h>
 #include <nuttx/sched.h>
-#include <os_internal.h>
 
 
 void nuttx_arch_init(void)

arch/rgmp/src/x86/arch_nuttx.c

@@ -43,7 +43,6 @@
 
 #include <arch/arch.h>
 #include <nuttx/sched.h>
-#include <os_internal.h>
 
 
 void nuttx_arch_init(void)

arch/sh/src/common/up_doirq.c

@@ -46,7 +46,6 @@
 #include <nuttx/arch.h>
 
 #include "up_arch.h"
-#include "os_internal.h"
 #include "up_internal.h"
 
 /****************************************************************************

arch/sh/src/common/up_releasestack.c

@@ -41,9 +41,10 @@
 
 #include <sched.h>
 #include <debug.h>
-#include <nuttx/arch.h>
 
-#include "os_internal.h"
+#include <nuttx/arch.h>
+#include <nuttx/kmalloc.h>
+
 #include "up_internal.h"
 
 /****************************************************************************

arch/sh/src/m16c/m16c_copystate.c

@@ -42,7 +42,8 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "os_internal.h"
+#include <arch/irq.h>
+
 #include "up_internal.h"
 
 /****************************************************************************

arch/sh/src/m16c/m16c_serial.c

@@ -56,7 +56,6 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "up_internal.h"
-#include "os_internal.h"
 #include "m16c_uart.h"
 
 /* Is there any serial support?  This might be the case if the board does