Changeset 8565a42 in mainline for kernel/arch/amd64/src/smp


Ignore:
Timestamp:
2018-03-02T20:34:50Z (8 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/amd64/src/smp/ap.S

    r3061bc1 r8565a42  
    5555        xorw %ax, %ax
    5656        movw %ax, %ds
    57        
     57
    5858        lgdtl ap_gdtr       # initialize Global Descriptor Table register
    59        
     59
    6060        movl %cr0, %eax
    6161        orl $CR0_PE, %eax
    … …  
    7171        movw $GDT_SELECTOR(UDATA_DES), %ax
    7272        movw %ax, %gs
    73        
     73
    7474        # Enable 64-bit page transaltion entries (CR4.PAE = 1).
    7575        # Paging is not enabled until after long mode is enabled
    76        
     76
    7777        movl %cr4, %eax
    7878        orl $CR4_PAE, %eax
    7979        movl %eax, %cr4
    80        
     80
    8181        leal ptl_0, %eax
    8282        movl %eax, %cr3
    83        
     83
    8484        # Enable long mode
    8585        movl $AMD_MSR_EFER, %ecx  # EFER MSR number
    … …  
    8787        orl $AMD_LME, %eax        # Set LME=1
    8888        wrmsr                     # Write EFER
    89        
     89
    9090        # Enable paging to activate long mode (set CR0.PG = 1)
    9191        movl %cr0, %eax
    9292        orl $CR0_PG, %eax
    9393        movl %eax, %cr0
    94        
     94
    9595        # At this point we are in compatibility mode
    9696        jmpl $GDT_SELECTOR(KTEXT_DES), $start64 - BOOT_OFFSET + AP_BOOT_OFFSET
    … …  
    100100        movabsq $ctx, %rsp
    101101        movq CONTEXT_OFFSET_SP(%rsp), %rsp
    102        
     102
    103103        pushq $0
    104104        movq %rsp, %rbp
    105        
     105
    106106        movabsq $main_ap, %rax
    107107        callq *%rax   # never returns
Note: See TracChangeset for help on using the changeset viewer.