Changeset 89c57b6 in mainline for kernel/arch/amd64/src/context.S

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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/amd64/src/context.S (modified) (2 diffs)

kernel/arch/amd64/src/context.S

@@ -45 +45 @@
         CONTEXT_SAVE_ARCH_CORE %rdi %rdx
         
-        xorq %rax, %rax       # context_save returns 1
-        incq %rax
+        xorl %eax, %eax       # context_save returns 1
+        incl %eax
         ret
 
@@ -60 +60 @@
         movq %rdx, (%rsp)
         
-        xorq %rax, %rax       # context_restore returns 0
+        xorl %eax, %eax       # context_restore returns 0
         ret