Changeset f14291b in mainline for kernel/arch/amd64/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/amd64/src/syscall.c (modified) (1 diff)

kernel/arch/amd64/src/syscall.c

@@ -58 +58 @@
          */
         write_msr(AMD_MSR_STAR,
-            ((uint64_t)(gdtselector(KDATA_DES) | PL_USER) << 48) |
-            ((uint64_t)(gdtselector(KTEXT_DES) | PL_KERNEL) << 32));
+            ((uint64_t) (GDT_SELECTOR(KDATA_DES) | PL_USER) << 48) |
+            ((uint64_t) (GDT_SELECTOR(KTEXT_DES) | PL_KERNEL) << 32));
         write_msr(AMD_MSR_LSTAR, (uint64_t)syscall_entry);
         /* Mask RFLAGS on syscall