Changeset 18b6a88 in mainline for kernel/arch

Timestamp:

2018-04-15T09:35:04Z (7 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.

Location:

kernel/arch

Files:

• abs32le/include/arch/mm/page.h (modified) (2 diffs)
• arm32/include/arch/cycle.h (modified) (1 diff)
• arm32/src/mach/integratorcp/integratorcp.c (modified) (2 diffs)
• ia64/src/mm/page.c (modified) (1 diff)
• sparc64/include/arch/sun4v/hypercall.h (modified) (3 diffs)

kernel/arch/abs32le/include/arch/mm/page.h

@@ -152 +152 @@
         pte_t *p = &pt[i];
 
-        return (
-            ((unsigned int) (!p->page_cache_disable) << PAGE_CACHEABLE_SHIFT) |
+        return (((unsigned int) (!p->page_cache_disable) << PAGE_CACHEABLE_SHIFT) |
             ((unsigned int) (!p->present) << PAGE_PRESENT_SHIFT) |
             ((unsigned int) p->uaccessible << PAGE_USER_SHIFT) |
@@ -159 +158 @@
             ((unsigned int) p->writeable << PAGE_WRITE_SHIFT) |
             (1 << PAGE_EXEC_SHIFT) |
-            ((unsigned int) p->global << PAGE_GLOBAL_SHIFT)
-        );
+            ((unsigned int) p->global << PAGE_GLOBAL_SHIFT));
 }
 

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;

kernel/arch/arm32/src/mach/integratorcp/integratorcp.c

@@ -245 +245 @@
 void icp_cpu_halt(void)
 {
-        while (true);
+        while (true)
+                ;
 }
 
@@ -345 +346 @@
 
 #ifdef CONFIG_PL011_UART
-        srln_instance_t *srln_instance = srln_init();
-        if (srln_instance) {
-                indev_t *sink = stdin_wire();
-                indev_t *srln = srln_wire(srln_instance, sink);
-                pl011_uart_input_wire(&icp.uart, srln);
-                icp_irqc_unmask(ICP_UART0_IRQ);
-        }
+        srln_instance_t *srln_instance = srln_init();
+        if (srln_instance) {
+                indev_t *sink = stdin_wire();
+                indev_t *srln = srln_wire(srln_instance, sink);
+                pl011_uart_input_wire(&icp.uart, srln);
+                icp_irqc_unmask(ICP_UART0_IRQ);
+        }
 #endif
 }

kernel/arch/ia64/src/mm/page.c

@@ -75 +75 @@
          * For paranoia reasons, we set it again.
          */
-        for(i = 0; i < REGION_REGISTERS; i++) {
+        for (i = 0; i < REGION_REGISTERS; i++) {
                 rr.word = rr_read(i);
                 rr.map.ve = 0;          /* disable VHPT walker */

kernel/arch/sparc64/include/arch/sun4v/hypercall.h

@@ -152 +152 @@
  */
 static inline uint64_t
-    __hypercall_fast(const uint64_t p1, const uint64_t p2, const uint64_t p3,
+__hypercall_fast(const uint64_t p1, const uint64_t p2, const uint64_t p3,
     const uint64_t p4, const uint64_t p5, const uint64_t function_number)
 {
@@ -187 +187 @@
  */
 static inline uint64_t
-    __hypercall_fast_ret1(const uint64_t p1, const uint64_t p2, const uint64_t p3,
+__hypercall_fast_ret1(const uint64_t p1, const uint64_t p2, const uint64_t p3,
     const uint64_t p4, const uint64_t p5, const uint64_t function_number,
     uint64_t *ret1)
@@ -223 +223 @@
  */
 static inline uint64_t
-    __hypercall_hyperfast(const uint64_t p1, const uint64_t p2, const uint64_t p3,
+__hypercall_hyperfast(const uint64_t p1, const uint64_t p2, const uint64_t p3,
     const uint64_t p4, const uint64_t p5, const uint64_t sw_trap_number)
 {