Changeset 8565a42 in mainline for kernel/generic/src/main/main.c

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.

File:

• kernel/generic/src/main/main.c (modified) (15 diffs)

kernel/generic/src/main/main.c

@@ -166 +166 @@
         config.cpu_count = 1;
         config.cpu_active = 1;
-        
+
         config.base = hardcoded_load_address;
         config.kernel_size = ALIGN_UP(hardcoded_ktext_size +
             hardcoded_kdata_size, PAGE_SIZE);
         config.stack_size = STACK_SIZE;
-        
+
         /* Initialy the stack is placed just after the kernel */
         config.stack_base = config.base + config.kernel_size;
-        
+
         /* Avoid placing stack on top of init */
         size_t i;
@@ -190 +190 @@
                 }
         }
-        
+
         /* Avoid placing stack on top of boot allocations. */
         if (ballocs.size) {
@@ -198 +198 @@
                             ballocs.size, PAGE_SIZE);
         }
-        
+
         if (config.stack_base < stack_safe)
                 config.stack_base = ALIGN_UP(stack_safe, PAGE_SIZE);
-        
+
         context_save(&ctx);
         context_set(&ctx, FADDR(main_bsp_separated_stack),
@@ -218 +218 @@
         /* Keep this the first thing. */
         the_initialize(THE);
-        
+
         version_print();
-        
+
         LOG("\nconfig.base=%p config.kernel_size=%zu"
             "\nconfig.stack_base=%p config.stack_size=%zu",
             (void *) config.base, config.kernel_size,
             (void *) config.stack_base, config.stack_size);
-        
+
 #ifdef CONFIG_KCONSOLE
         /*
@@ -234 +234 @@
         kconsole_init();
 #endif
-        
+
         /*
          * Exception handler initialization, before architecture
@@ -240 +240 @@
          */
         exc_init();
-        
+
         /*
          * Memory management subsystems initialization.
@@ -260 +260 @@
         ARCH_OP(pre_smp_init);
         smp_init();
-        
+
         /* Slab must be initialized after we know the number of processors. */
         slab_enable_cpucache();
-        
+
         uint64_t size;
         const char *size_suffix;
@@ -269 +269 @@
         printf("Detected %u CPU(s), %" PRIu64 " %s free memory\n",
             config.cpu_count, size, size_suffix);
-        
+
         cpu_init();
         calibrate_delay_loop();
@@ -293 +293 @@
         } else
                 printf("No init binaries found.\n");
-        
+
         ipc_init();
         event_init();
@@ -299 +299 @@
         log_init();
         stats_init();
-        
+
         /*
          * Create kernel task.
@@ -306 +306 @@
         if (!kernel)
                 panic("Cannot create kernel task.");
-        
+
         /*
          * Create the first thread.
@@ -315 +315 @@
                 panic("Cannot create kinit thread.");
         thread_ready(kinit_thread);
-        
+
         /*
          * This call to scheduler() will return to kinit,
@@ -344 +344 @@
          */
         config.cpu_active++;
-        
+
         /*
          * The THE structure is well defined because ctx.sp is used as stack.
          */
         the_initialize(THE);
-        
+
         ARCH_OP(pre_mm_init);
         frame_init();
@@ -355 +355 @@
         tlb_init();
         ARCH_OP(post_mm_init);
-        
+
         cpu_init();
         calibrate_delay_loop();
         ARCH_OP(post_cpu_init);
-        
+
         the_copy(THE, (the_t *) CPU->stack);
-        
+
         /*
          * If we woke kmp up before we left the kernel stack, we could
@@ -382 +382 @@
 {
         smp_call_init();
-        
+
         /*
          * Configure timeouts for this cpu.
          */
         timeout_init();
-        
+
         waitq_wakeup(&ap_completion_wq, WAKEUP_FIRST);
         scheduler();