Inclusion fixes for CM3 kernel

[arc.git] / arch / arm / arm_cm3 / kernel / core_cm3.h

diff --git a/arch/arm/arm_cm3/kernel/core_cm3.h b/arch/arm/arm_cm3/kernel/core_cm3.h
index cd422113fbcd1245895ae0e427012325be11b68c..270883df2a249ad4ab27e2469e73304dd1bc4427 100644 (file)
--- a/arch/arm/arm_cm3/kernel/core_cm3.h
+++ b/arch/arm/arm_cm3/kernel/core_cm3.h
@@ -22,20 +22,6 @@
 \r
 #ifndef __CM3_CORE_H__\r
 #define __CM3_CORE_H__\r
-#include "stm32f10x.h"\r
-\r
-static inline unsigned long _Irq_Save(void)\r
-{\r
-   unsigned long val = __get_PRIMASK();\r
-   Irq_Disable();\r
-   return val;\r
-}\r
-\r
-/*-----------------------------------------------------------------*/\r
-\r
-static inline void _Irq_Restore(unsigned mask) {\r
-       __set_PRIMASK(mask);\r
-}\r
 \r
 \r
 \r
@@ -1377,6 +1363,22 @@ static __INLINE uint32_t ITM_SendChar (uint32_t ch)
   return (ch);\r
 }\r
 \r
+/* ---  Arctic Core --- */\r
+\r
+static inline unsigned long _Irq_Save(void)\r
+{\r
+   unsigned long val = __get_PRIMASK();\r
+   __disable_irq();\r
+   return val;\r
+}\r
+\r
+\r
+static inline void _Irq_Restore(unsigned mask) {\r
+       __set_PRIMASK(mask);\r
+}\r
+\r
+\r
+\r
 #ifdef __cplusplus\r
 }\r
 #endif\r