Changeset 8565a42 in mainline for kernel/generic/src/cpu

Timestamp:

2018-03-02T20:34:50Z (7 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

a1a81f69, d5e5fd1

Parents:

3061bc1 (diff), 34e1206 (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.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)

git-committer:

GitHub <noreply@…> (2018-03-02 20:34:50)

Message:

Remove all trailing whitespace, everywhere.

See individual commit messages for details.

Location:

kernel/generic/src/cpu

Files:

• cpu.c (modified) (4 diffs)
• cpu_mask.c (modified) (7 diffs)

kernel/generic/src/cpu/cpu.c

@@ -63 +63 @@
         if (config.cpu_active == 1) {
 #endif /* CONFIG_SMP */
-                
+
                 cpus = (cpu_t *) malloc(sizeof(cpu_t) * config.cpu_count,
                     FRAME_ATOMIC);
                 if (!cpus)
                         panic("Cannot allocate CPU structures.");
-                
+
                 /* Initialize everything */
                 memsetb(cpus, sizeof(cpu_t) * config.cpu_count, 0);
-                
+
                 size_t i;
                 for (i = 0; i < config.cpu_count; i++) {
@@ -78 +78 @@
                         if (!stack_phys)
                                 panic("Cannot allocate CPU stack.");
-                        
+
                         cpus[i].stack = (uint8_t *) PA2KA(stack_phys);
                         cpus[i].id = i;
-                        
+
                         irq_spinlock_initialize(&cpus[i].lock, "cpus[].lock");
-                        
+
                         for (unsigned int j = 0; j < RQ_COUNT; j++) {
                                 irq_spinlock_initialize(&cpus[i].rq[j].lock, "cpus[].rq[].lock");
@@ -89 +89 @@
                         }
                 }
-                
+
 #ifdef CONFIG_SMP
         }
 #endif /* CONFIG_SMP */
-        
+
         CPU = &cpus[config.cpu_active - 1];
-        
+
         CPU->active = true;
         CPU->tlb_active = true;
-        
+
         CPU->idle = false;
         CPU->last_cycle = get_cycle();
         CPU->idle_cycles = 0;
         CPU->busy_cycles = 0;
-        
+
         cpu_identify();
         cpu_arch_init();
@@ -113 +113 @@
 {
         unsigned int i;
-        
+
         for (i = 0; i < config.cpu_count; i++) {
                 if (cpus[i].active)

kernel/generic/src/cpu/cpu_mask.c

@@ -55 +55 @@
         assert(NULL != cpus);
         assert(cpu_cnt <= config.cpu_count);
-        
+
         for (size_t active_word = 0;
                 (active_word + 1) * word_bit_cnt <= cpu_cnt;
@@ -62 +62 @@
                 cpus->mask[active_word] = -1;
         }
-        
+
         size_t remaining_bits = (cpu_cnt % word_bit_cnt);
         if (0 < remaining_bits) {
@@ -89 +89 @@
 {
         assert(cpus);
-        
+
         size_t word_cnt = cpu_mask_size() / word_size;
-                
+
         for (size_t word = 0; word < word_cnt; ++word) {
                 cpus->mask[word] = 0;
@@ -102 +102 @@
         size_t word = cpu_id / word_bit_cnt;
         size_t word_pos = cpu_id % word_bit_cnt;
-        
+
         cpus->mask[word] |= (1U << word_pos);
 }
@@ -111 +111 @@
         size_t word = cpu_id / word_bit_cnt;
         size_t word_pos = cpu_id % word_bit_cnt;
-        
+
         cpus->mask[word] &= ~(1U << word_pos);
 }
@@ -120 +120 @@
         size_t word = cpu_id / word_bit_cnt;
         size_t word_pos = cpu_id % word_bit_cnt;
-        
+
         return 0 != (cpus->mask[word] & (1U << word_pos));
 }
@@ -133 +133 @@
                         return false;
         }
-        
+
         return true;
 }