Ignore:
Timestamp:
2016-05-22T19:19:43Z (9 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
b272c67a
Parents:
153c7a29 (diff), af2254ec (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.
Message:

Merge mainline changes

File:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/ia32/src/boot/vesa_real.inc

    r153c7a29 r0dc2fec  
    4949vesa_init_real:
    5050        mov %cr0, %eax
    51         and $~1, %eax
     51        and $~CR0_PE, %eax
    5252        mov %eax, %cr0
    5353       
    … …  
    352352               
    353353                        mov %cr0, %ecx
    354                         or $1, %ecx
     354                        or $CR0_PE, %ecx
    355355                        mov %ecx, %cr0
    356356                       
Note: See TracChangeset for help on using the changeset viewer.