Changeset bd5f3b7 in mainline for kernel/arch/ia32/src/asm.S

Timestamp:

2011-08-21T13:07:35Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

00aece0, f1a9e87

Parents:

86a34d3e (diff), a6480d5 (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/asm.S (modified) (1 diff)

kernel/arch/ia32/src/asm.S

@@ -405 +405 @@
         xorl %eax, %eax
         cmpl $(GDT_SELECTOR(KTEXT_DES)), ISTATE_OFFSET_CS(%esp)
+#ifdef PROCESSOR_i486
+        jz 0f
+                movl %eax, %ebp
+        0:
+#else
         cmovnzl %eax, %ebp
+#endif
 
         movl %ebp, ISTATE_OFFSET_EBP_FRAME(%esp)