Changeset fb45c7b in mainline


Ignore:
Timestamp:
2011-09-25T20:03:28Z (13 years ago)
Author:
Martin Sucha <sucha14@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
e0e00d7
Parents:
6d8c4654
Message:

Call PSE variant of map_kernel on AP.
This fixes boot on ia32 with SMP enabled.

Location:
kernel/arch/ia32/src
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/ia32/src/boot/boot.S

    r6d8c4654 rfb45c7b  
    125125                /* Map kernel and turn paging on */
    126126                pm_status $status_non_pse
    127                 call map_kernel
     127                call map_kernel_non_pse
    128128       
    129129        stack_init:
    … …  
    196196 *
    197197 */
    198 .global map_kernel
    199 map_kernel:
     198map_kernel_non_pse:
    200199        /* Paging features */
    201200        movl %cr4, %ecx

  • kernel/arch/ia32/src/smp/ap.S

    r6d8c4654 rfb45c7b  
    7474        subl $0x80000000, %esp                  # KA2PA(ctx.sp)
    7575
    76         call map_kernel                                 # map kernel and turn paging on
     76        /* We assume that when using SMP, PSE is always available */
     77        call map_kernel_pse                             # map kernel and turn paging on
    7778       
    7879        addl $0x80000000, %esp                  # PA2KA(ctx.sp)
Note: See TracChangeset for help on using the changeset viewer.