3 files changed, 18 insertions, 7 deletions
diff --git a/cpukit/score/cpu/i386/asm.h b/cpukit/score/cpu/i386/asm.h
index adf92f935a..aac1ba9dbe 100644
--- a/cpukit/score/cpu/i386/asm.h
+++ b/cpukit/score/cpu/i386/asm.h
@@ -31,7 +31,7 @@
  */
 
 #define ASM
-#include <rtems/i386.h>
+#include <rtems/core/i386.h>
 
 /*
  *  Recent versions of GNU cpp define variables which indicate the
diff --git a/cpukit/score/cpu/i386/cpu.c b/cpukit/score/cpu/i386/cpu.c
index d1ceaba88a..446515d6f9 100644
--- a/cpukit/score/cpu/i386/cpu.c
+++ b/cpukit/score/cpu/i386/cpu.c
@@ -15,8 +15,8 @@
 
 #include <rtems/system.h>
 #include <rtems/fatal.h>
-#include <rtems/isr.h>
-#include <rtems/wkspace.h>
+#include <rtems/core/isr.h>
+#include <rtems/core/wkspace.h>
 
 /*  _CPU_Initialize
  *
@@ -36,9 +36,6 @@ void _CPU_Initialize(
   register unsigned16  fp_status asm ("ax");
   register unsigned8  *fp_context;
 
-  if ( cpu_table == NULL )
-    rtems_fatal_error_occurred( RTEMS_NOT_CONFIGURED );
-
   _CPU_Table = *cpu_table;
 
   /*
@@ -69,6 +66,20 @@ void _CPU_Initialize(
 
 /*PAGE
  *
+ *  _CPU_ISR_Get_level
+ */
+ 
+unsigned32 _CPU_ISR_Get_level( void )
+{
+  unsigned32 level;
+ 
+  i386_get_interrupt_level( level );
+ 
+  return level;
+}
+ 
+/*PAGE
+ *
  *  _CPU_ISR_install_raw_handler
  */
  
diff --git a/cpukit/score/cpu/i386/rtems/asm.h b/cpukit/score/cpu/i386/rtems/asm.h
index adf92f935a..aac1ba9dbe 100644
--- a/cpukit/score/cpu/i386/rtems/asm.h
+++ b/cpukit/score/cpu/i386/rtems/asm.h
@@ -31,7 +31,7 @@
  */
 
 #define ASM
-#include <rtems/i386.h>
+#include <rtems/core/i386.h>
 
 /*
  *  Recent versions of GNU cpp define variables which indicate the