Changeset 8565a42 in mainline for kernel/arch/ia32/src/ia32.c


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/ia32/src/ia32.c

    r3061bc1 r8565a42  
    9292        multiboot_info_parse(signature, (multiboot_info_t *) info);
    9393        multiboot2_info_parse(signature, (multiboot2_info_t *) info);
    94        
     94
    9595#ifdef CONFIG_SMP
    9696        /* Copy AP bootstrap routines below 1 MB. */
     
    107107                interrupt_init();
    108108                bios_init();
    109                
     109
    110110                /* PIC */
    111111                i8259_init();
     
    120120                /* Initialize IRQ routing */
    121121                irq_init(IRQ_COUNT, IRQ_COUNT);
    122                
     122
    123123                /* hard clock */
    124124                i8254_init();
    125                
     125
    126126#if (defined(CONFIG_FB) || defined(CONFIG_EGA))
    127127                bool bfb = false;
    128128#endif
    129                
     129
    130130#ifdef CONFIG_FB
    131131                bfb = bfb_init();
    132132#endif
    133                
     133
    134134#ifdef CONFIG_EGA
    135135                if (!bfb) {
     
    139139                }
    140140#endif
    141                
     141
    142142                /* Merge all memory zones to 1 big zone */
    143143                zone_merge_all();
     
    220220        }
    221221#endif
    222        
     222
    223223        if (irqs_info != NULL)
    224224                sysinfo_set_item_val(irqs_info, NULL, true);
Note: See TracChangeset for help on using the changeset viewer.