Changes in kernel/arch/arm32/src/exception.c [08a2007:a99a3d7] in mainline

File:

• kernel/arch/arm32/src/exception.c (modified) (1 diff)

kernel/arch/arm32/src/exception.c

@@ -120 +120 @@
 static void high_vectors(void)
 {
-        register uint32_t control_reg = 0;
+        uint32_t control_reg;
         
-#if defined(PROCESSOR_armv7)
-        asm volatile (
-                "mrc p15, 0, %[control_reg], c1, c0"
-                : [control_reg] "=r" (control_reg)
-        );
-#elif defined(PROCESSOR_armv4) | defined(PROCESSOR_armv5)
         asm volatile (
                 "mrc p15, 0, %[control_reg], c1, c1"
                 : [control_reg] "=r" (control_reg)
         );
-#endif
         
         /* switch on the high vectors bit */
         control_reg |= CP15_R1_HIGH_VECTORS_BIT;
         
-#if defined(PROCESSOR_armv7)
-        asm volatile (
-                "mcr p15, 0, %[control_reg], c1, c0"
-                :: [control_reg] "r" (control_reg)
-        );
-#elif defined(PROCESSOR_armv4) | defined(PROCESSOR_armv5)
         asm volatile (
                 "mcr p15, 0, %[control_reg], c1, c1"
                 :: [control_reg] "r" (control_reg)
         );
-#endif
 }
 #endif