Changeset f14291b in mainline for kernel/arch/ia32/src/syscall.c

Timestamp:

2010-10-19T20:55:53Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a93d79a

Parents:

1882525 (diff), a7a85d16 (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/syscall.c (modified) (1 diff)

kernel/arch/ia32/src/syscall.c

@@ -45 +45 @@
 
         /* set kernel mode CS selector */
-        write_msr(IA32_MSR_SYSENTER_CS, gdtselector(KTEXT_DES));
+        write_msr(IA32_MSR_SYSENTER_CS, GDT_SELECTOR(KTEXT_DES));
         /* set kernel mode entry point */
         write_msr(IA32_MSR_SYSENTER_EIP, (uint32_t) sysenter_handler);