Changeset 8565a42 in mainline for kernel/arch/amd64/src/amd64.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/arch/amd64/src/amd64.c (modified) (5 diffs)

kernel/arch/amd64/src/amd64.c

@@ -92 +92 @@
         multiboot_info_parse(signature, (multiboot_info_t *) info);
         multiboot2_info_parse(signature, (multiboot2_info_t *) info);
-        
+
 #ifdef CONFIG_SMP
         /* Copy AP bootstrap routines below 1 MB. */
@@ -106 +106 @@
         /* Enable FPU */
         cpu_setup_fpu();
-        
+
         /* Initialize segmentation */
         pm_init();
-        
+
         /* Disable I/O on nonprivileged levels, clear the nested-thread flag */
         write_rflags(read_rflags() & ~(RFLAGS_IOPL | RFLAGS_NT));
         /* Disable alignment check */
         write_cr0(read_cr0() & ~CR0_AM);
-        
+
         if (config.cpu_active == 1) {
                 interrupt_init();
                 bios_init();
-                
+
                 /* PIC */
                 i8259_init();
@@ -132 +132 @@
                 /* Initialize IRQ routing */
                 irq_init(IRQ_COUNT, IRQ_COUNT);
-                
+
                 /* hard clock */
                 i8254_init();
-                
+
 #if (defined(CONFIG_FB) || defined(CONFIG_EGA))
                 bool bfb = false;
 #endif
-                
+
 #ifdef CONFIG_FB
                 bfb = bfb_init();
 #endif
-                
+
 #ifdef CONFIG_EGA
                 if (!bfb) {
@@ -151 +151 @@
                 }
 #endif
-                
+
                 /* Merge all memory zones to 1 big zone */
                 zone_merge_all();
         }
-        
+
         /* Setup fast SYSCALL/SYSRET */
         syscall_setup_cpu();
@@ -235 +235 @@
         }
 #endif
-        
+
         if (irqs_info != NULL)
                 sysinfo_set_item_val(irqs_info, NULL, true);