Changeset 3deb0155 in mainline for kernel/arch/arm32/src/fpu_context.c

Timestamp:

2013-04-10T19:11:45Z (12 years ago)

Author:

Beniamino Galvani <b.galvani@…>

Branches:

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

Children:

dd0c8a0

Parents:

44186b01 (diff), b4f43a1 (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/fpu_context.c (modified) (1 diff)

kernel/arch/arm32/src/fpu_context.c

@@ -119 +119 @@
  * rely on user decision to use CONFIG_FPU.
  */
-#ifdef PROCESSOR_ARC_armv7_a
+#ifdef PROCESSOR_ARCH_armv7_a
         const uint32_t cpacr = CPACR_read();
         /* FPU needs access to coprocessor 10 and 11.
-         * Moreover they need to have same access enabledd */
+         * Moreover they need to have same access enabled */
         if (((cpacr & CPACR_CP_MASK(10)) != CPACR_CP_FULL_ACCESS(10)) &&
            ((cpacr & CPACR_CP_MASK(11)) != CPACR_CP_FULL_ACCESS(11))) {