1 files changed, 6 insertions, 26 deletions
diff --git a/c/src/exec/rtems/src/intr.c b/c/src/exec/rtems/src/intr.c
index 25f5176967..dbcc23434c 100644
--- a/c/src/exec/rtems/src/intr.c
+++ b/c/src/exec/rtems/src/intr.c
@@ -14,10 +14,9 @@
  */
 
 #include <rtems/system.h>
-#include <rtems/isr.h>
-#include <rtems/stack.h>
-#include <rtems/intr.h>
-#include <rtems/wkspace.h>
+#include <rtems/rtems/status.h>
+#include <rtems/core/isr.h>
+#include <rtems/rtems/intr.h>
 
 /*  _Interrupt_Manager_initialization
  *
@@ -30,25 +29,6 @@
 
 void _Interrupt_Manager_initialization( void )
 {
-#if ( CPU_ALLOCATE_INTERRUPT_STACK == TRUE )
-
-  if ( _CPU_Table.interrupt_stack_size < RTEMS_MINIMUM_STACK_SIZE )
-    rtems_fatal_error_occurred( RTEMS_INVALID_SIZE );
-
-  _CPU_Interrupt_stack_low =
-    _Workspace_Allocate_or_fatal_error( _CPU_Table.interrupt_stack_size );
-
-  _CPU_Interrupt_stack_high = _Addresses_Add_offset(
-    _CPU_Interrupt_stack_low,
-    _CPU_Table.interrupt_stack_size
-  );
-
-#endif
-
-#if ( CPU_HAS_HARDWARE_INTERRUPT_STACK == TRUE )
-  _CPU_Install_interrupt_stack();
-#endif
-
 }
 
 /*  rtems_interrupt_catch
@@ -73,13 +53,13 @@ rtems_status_code rtems_interrupt_catch(
 )
 {
   if ( !_ISR_Is_vector_number_valid( vector ) )
-    return( RTEMS_INVALID_NUMBER );
+    return RTEMS_INVALID_NUMBER;
 
   if ( !_ISR_Is_valid_user_handler( new_isr_handler ) )
-    return( RTEMS_INVALID_ADDRESS );
+    return RTEMS_INVALID_ADDRESS;
 
   _ISR_Install_vector(
     vector, (proc_ptr)new_isr_handler, (proc_ptr *)old_isr_handler );
 
-  return( RTEMS_SUCCESSFUL );
+  return RTEMS_SUCCESSFUL;
 }