Changes in kernel/arch/arm32/src/exception.c [9a5ccc14:5481a22e] in mainline

File:

• kernel/arch/arm32/src/exception.c (modified) (3 diffs)

kernel/arch/arm32/src/exception.c

@@ -39 +39 @@
 #include <interrupt.h>
 #include <arch/mm/page_fault.h>
-#include <arch/cp15.h>
 #include <arch/barrier.h>
 #include <print.h>
@@ -74 +73 @@
         /* make it LDR instruction and store at exception vector */
         *vector = handler_address_ptr | LDR_OPCODE;
-        smc_coherence(vector);
+        smc_coherence(*vector);
         
         /* store handler's address */
@@ -137 +136 @@
 static void high_vectors(void)
 {
-        uint32_t control_reg = SCTLR_read();
+        uint32_t control_reg = 0;
+        asm volatile (
+                "mrc p15, 0, %[control_reg], c1, c0"
+                : [control_reg] "=r" (control_reg)
+        );
         
         /* switch on the high vectors bit */
-        control_reg |= SCTLR_HIGH_VECTORS_EN_FLAG;
-        
-        SCTLR_write(control_reg);
+        control_reg |= CP15_R1_HIGH_VECTORS_EN;
+        
+        asm volatile (
+                "mcr p15, 0, %[control_reg], c1, c0"
+                :: [control_reg] "r" (control_reg)
+        );
 }
 #endif