Changeset 89ac5513 in mainline for uspace/lib/c/arch/ia32/src/entry.S

Timestamp:

2013-06-23T19:54:53Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ddb1922

Parents:

3abf0760 (diff), 96cbd18 (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:

• uspace/lib/c/arch/ia32/src/entry.S (modified) (2 diffs)

uspace/lib/c/arch/ia32/src/entry.S

@@ -47 +47 @@
         # Do not set %gs, it contains descriptor that can see TLS
         
-#ifndef PROCESSOR_i486  
+#ifndef PROCESSOR_i486
         # Detect the mechanism used for making syscalls
         movl $(INTEL_CPUID_STANDARD), %eax
@@ -62 +62 @@
         #
         pushl $0
+        pushl $0
         movl %esp, %ebp