Changeset 5f70118 in mainline for kernel/arch/ia32/src/boot/boot.S

Timestamp:

2010-01-10T12:16:59Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c77a64f

Parents:

309ede1 (diff), 1ac3a52 (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:

• kernel/arch/ia32/src/boot/boot.S (modified) (3 diffs)

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

@@ -85 +85 @@
         pse_supported:
         
-        bt $(INTEL_SEP), %edx
-        jc sep_supported
-        
-                movl $sep_msg, %esi
-                jmp error_halt
-        
-        sep_supported:
-
 #include "vesa_prot.inc"
 
@@ -102 +94 @@
         pushl grub_eax
         call arch_pre_main
+
+        # Create the first stack frame
+        pushl $0
+        movl %esp, %ebp
         
         call main_bsp
@@ -225 +221 @@
         .asciz "Page Size Extension not supported. System halted."
 
-sep_msg:
-        .asciz "SYSENTER/SYSEXIT not supported. System halted."