Changeset cc250b3 in mainline for kernel/arch/arm32/src/exception.c

Timestamp:

2012-09-06T12:31:05Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

504f1756

Parents:

ecd1a0a (diff), 8cf4823 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

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

kernel/arch/arm32/src/exception.c

@@ -142 +142 @@
 #elif defined(PROCESSOR_armv4) | defined(PROCESSOR_armv5)
         asm volatile (
-                "mrc p15, 0, %[control_reg], c1, c1"
+                "mrc p15, 0, %[control_reg], c1, c0"
                 : [control_reg] "=r" (control_reg)
         );
@@ -157 +157 @@
 #elif defined(PROCESSOR_armv4) | defined(PROCESSOR_armv5)
         asm volatile (
-                "mcr p15, 0, %[control_reg], c1, c1"
+                "mcr p15, 0, %[control_reg], c1, c0"
                 :: [control_reg] "r" (control_reg)
         );