Changeset 18b6a88 in mainline for kernel/arch/arm32/include

Timestamp:

2018-04-15T09:35:04Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c1f44ca

Parents:

8ebe212

Message:

More ccheck fixes, sometimes with manual intervention.

File:

• kernel/arch/arm32/include/arch/cycle.h (modified) (1 diff)

kernel/arch/arm32/include/arch/cycle.h

@@ -52 +52 @@
         if ((ID_PFR1_read() & ID_PFR1_GEN_TIMER_EXT_MASK) ==
             ID_PFR1_GEN_TIMER_EXT) {
-            uint32_t low = 0, high = 0;
-            asm volatile( "MRRC p15, 0, %[low], %[high], c14": [low]"=r"(low), [high]"=r"(high));
-           return ((uint64_t)high << 32) | low;
+                uint32_t low = 0, high = 0;
+                asm volatile (
+                    "MRRC p15, 0, %[low], %[high], c14"
+                    : [low] "=r" (low), [high] "=r" (high)
+                );
+                return ((uint64_t)high << 32) | low;
         } else {
                 return (uint64_t)PMCCNTR_read() * 64;