Index: kernel/arch/ia32/src/asm.S
===================================================================
--- kernel/arch/ia32/src/asm.S	(revision 246f939e5a6aa9f58ef53bebdf4fb6079351f238)
+++ kernel/arch/ia32/src/asm.S	(revision d0294342dd3ac03e0c663f4db0665ad183ac8bea)
@@ -227,5 +227,5 @@
 	 * Switch to kernel selectors.
 	 */
-	movw $16, %ax
+	movw $(gdtselector(KDATA_DES)), %ax
 	movw %ax, %ds
 	movw %ax, %es
@@ -308,5 +308,5 @@
 	 * Switch to kernel selectors.
 	 */
-	movl $16, %eax
+	movl $(gdtselector(KDATA_DES)), %eax
 	movl %eax, %ds
 	movl %eax, %es
@@ -417,5 +417,5 @@
 	 * Switch to kernel selectors.
 	 */
-	movl $16, %eax
+	movl $(gdtselector(KDATA_DES)), %eax
 	movl %eax, %ds
 	movl %eax, %es
@@ -426,5 +426,5 @@
 	 */
 	xorl %eax, %eax
-	cmpl $8, ISTATE_OFFSET_CS(%esp)
+	cmpl $(gdtselector(KTEXT_DES)), ISTATE_OFFSET_CS(%esp)
 	cmovnzl %eax, %ebp