Index: arch/ia32/src/pm.c
===================================================================
--- arch/ia32/src/pm.c	(revision 1eb0dd13085f33bbf2be2a9269a37700bb8a6e29)
+++ arch/ia32/src/pm.c	(revision 608758003e0cf8cb0abab35a7d32f9861530d105)
@@ -129,5 +129,5 @@
 
 
-// Clean IOPL(12,13) and NT(14) flags in EFLAGS register
+/* Clean IOPL(12,13) and NT(14) flags in EFLAGS register */
 static void clean_IOPL_NT_flags(void)
 {
@@ -145,5 +145,5 @@
 }
 
-// Clean AM(18) flag in CR0 register
+/* Clean AM(18) flag in CR0 register */
 static void clean_AM_flag(void)
 {
@@ -201,5 +201,5 @@
 	__asm__("ltr %0" : : "r" ((__u16) selector(TSS_DES)));
 	
-	clean_IOPL_NT_flags();    //Disable I/O on nonprivileged levels 
-	clean_AM_flag();          //Disable alignment check
-}
+	clean_IOPL_NT_flags();    /* Disable I/O on nonprivileged levels */
+	clean_AM_flag();          /* Disable alignment check */
+}
Index: arch/ia32/src/userspace.c
===================================================================
--- arch/ia32/src/userspace.c	(revision 1eb0dd13085f33bbf2be2a9269a37700bb8a6e29)
+++ arch/ia32/src/userspace.c	(revision 608758003e0cf8cb0abab35a7d32f9861530d105)
@@ -47,5 +47,5 @@
 
 	__asm__ volatile (""
-    // CLNT
+    /* CLNT */
 		"pushfl;"
 		"pop %%eax;"
Index: doc/TODO
===================================================================
--- doc/TODO	(revision 1eb0dd13085f33bbf2be2a9269a37700bb8a6e29)
+++ doc/TODO	(revision 608758003e0cf8cb0abab35a7d32f9861530d105)
@@ -17,5 +17,6 @@
   + before IRET (from SYSCALL), zero NT in EFLAGS                         [DONE]
 + [ia32] review the cache controling bits in CR0 register
-+ [ia32] zero the alignment exception bit in EFLAGS
++ [ia32] zero the alignment exception bit in EFLAGS                       [DONE]
+  - Task changed to clean AM in CR0 so the alignment check is disabled globaly
 + make emulated architectures also work on real hardware
 + bring in support for other architectures (e.g. PowerPC)