Index: kernel/arch/ia32/include/pm.h
===================================================================
--- kernel/arch/ia32/include/pm.h	(revision afdce6eb6647400d64368bbf99e9453de5b361ac)
+++ kernel/arch/ia32/include/pm.h	(revision 0160b1c819f587fd17ea9ba55883dba10a3e4036)
@@ -59,5 +59,5 @@
 
 
-#define selector(des)	((des) << 3)
+#define gdtselector(des)	((des) << 3)
 
 #define PL_KERNEL	0
Index: kernel/arch/ia32/src/ddi/ddi.c
===================================================================
--- kernel/arch/ia32/src/ddi/ddi.c	(revision afdce6eb6647400d64368bbf99e9453de5b361ac)
+++ kernel/arch/ia32/src/ddi/ddi.c	(revision 0160b1c819f587fd17ea9ba55883dba10a3e4036)
@@ -157,5 +157,5 @@
 	 */
 	gdt_p[TSS_DES].access = AR_PRESENT | AR_TSS | DPL_KERNEL;
-	tr_load(selector(TSS_DES));
+	tr_load(gdtselector(TSS_DES));
 	
 	/*
Index: kernel/arch/ia32/src/pm.c
===================================================================
--- kernel/arch/ia32/src/pm.c	(revision afdce6eb6647400d64368bbf99e9453de5b361ac)
+++ kernel/arch/ia32/src/pm.c	(revision 0160b1c819f587fd17ea9ba55883dba10a3e4036)
@@ -128,5 +128,5 @@
 
 		d->unused = 0;
-		d->selector = selector(KTEXT_DES);
+		d->selector = gdtselector(KTEXT_DES);
 
 		d->access = AR_PRESENT | AR_INTERRUPT;	/* masking interrupt */
@@ -215,5 +215,5 @@
 	 * to its own TSS. We just need to load the TR register.
 	 */
-	tr_load(selector(TSS_DES));
+	tr_load(gdtselector(TSS_DES));
 	
 	clean_IOPL_NT_flags();    /* Disable I/O on nonprivileged levels and clear NT flag. */
Index: kernel/arch/ia32/src/proc/scheduler.c
===================================================================
--- kernel/arch/ia32/src/proc/scheduler.c	(revision afdce6eb6647400d64368bbf99e9453de5b361ac)
+++ kernel/arch/ia32/src/proc/scheduler.c	(revision 0160b1c819f587fd17ea9ba55883dba10a3e4036)
@@ -66,5 +66,5 @@
 	/* Set kernel stack for CPL3 -> CPL0 switch via interrupt */
 	CPU->arch.tss->esp0 = kstk;
-	CPU->arch.tss->ss0 = selector(KDATA_DES);
+	CPU->arch.tss->ss0 = gdtselector(KDATA_DES);
 
 	/* Set up TLS in GS register */
Index: kernel/arch/ia32/src/syscall.c
===================================================================
--- kernel/arch/ia32/src/syscall.c	(revision afdce6eb6647400d64368bbf99e9453de5b361ac)
+++ kernel/arch/ia32/src/syscall.c	(revision 0160b1c819f587fd17ea9ba55883dba10a3e4036)
@@ -45,5 +45,5 @@
 
 	/* set kernel mode CS selector */
-	write_msr(IA32_MSR_SYSENTER_CS, selector(KTEXT_DES));
+	write_msr(IA32_MSR_SYSENTER_CS, gdtselector(KTEXT_DES));
 	/* set kernel mode entry point */
 	write_msr(IA32_MSR_SYSENTER_EIP, (uint32_t) sysenter_handler);
Index: kernel/arch/ia32/src/userspace.c
===================================================================
--- kernel/arch/ia32/src/userspace.c	(revision afdce6eb6647400d64368bbf99e9453de5b361ac)
+++ kernel/arch/ia32/src/userspace.c	(revision 0160b1c819f587fd17ea9ba55883dba10a3e4036)
@@ -75,11 +75,11 @@
 		"iret\n"
 		:
-		: [udata_des] "i" (selector(UDATA_DES) | PL_USER),
+		: [udata_des] "i" (gdtselector(UDATA_DES) | PL_USER),
 		  [stack_size] "r" ((uint8_t *) kernel_uarg->uspace_stack + THREAD_STACK_SIZE),
 		  [ipl] "r" (ipl),
-		  [utext_des] "i" (selector(UTEXT_DES) | PL_USER),
+		  [utext_des] "i" (gdtselector(UTEXT_DES) | PL_USER),
 		  [entry] "r" (kernel_uarg->uspace_entry),
 		  [uarg] "r" (kernel_uarg->uspace_uarg),
-		  [tls_des] "r" (selector(TLS_DES))
+		  [tls_des] "r" (gdtselector(TLS_DES))
 		: "eax");