Index: kernel/arch/amd64/_link.ld.in
===================================================================
--- kernel/arch/amd64/_link.ld.in	(revision deacd722f7dca626637926215ebe69ffd2fd67f5)
+++ kernel/arch/amd64/_link.ld.in	(revision 5071f8a8d049c5ec42cf8d3640c718d3cf19c5a6)
@@ -33,5 +33,5 @@
 		*(COMMON);      /* global variables */
 
-		/* XXX: bss can't be omitted from the ELF image. */
+		/* bss can't be omitted from the ELF image. */
 		*(.bss);        /* uninitialized static variables */
 
Index: kernel/arch/arm32/include/arch/context_struct.h
===================================================================
--- kernel/arch/arm32/include/arch/context_struct.h	(revision deacd722f7dca626637926215ebe69ffd2fd67f5)
+++ kernel/arch/arm32/include/arch/context_struct.h	(revision 5071f8a8d049c5ec42cf8d3640c718d3cf19c5a6)
@@ -32,5 +32,5 @@
 #include <typedefs.h>
 
-// XXX: This struct must match assembly code in src/context.S
+// NOTE: This struct must match assembly code in src/context.S
 
 /*
Index: kernel/arch/arm32/include/arch/istate_struct.h
===================================================================
--- kernel/arch/arm32/include/arch/istate_struct.h	(revision deacd722f7dca626637926215ebe69ffd2fd67f5)
+++ kernel/arch/arm32/include/arch/istate_struct.h	(revision 5071f8a8d049c5ec42cf8d3640c718d3cf19c5a6)
@@ -32,5 +32,5 @@
 #include <stdint.h>
 
-// XXX: Must match assembly code in src/exc_handler.S
+// NOTE: Must match assembly code in src/exc_handler.S
 
 typedef struct istate {
Index: kernel/arch/ia32/_link.ld.in
===================================================================
--- kernel/arch/ia32/_link.ld.in	(revision deacd722f7dca626637926215ebe69ffd2fd67f5)
+++ kernel/arch/ia32/_link.ld.in	(revision 5071f8a8d049c5ec42cf8d3640c718d3cf19c5a6)
@@ -32,5 +32,5 @@
 		*(COMMON);              /* global variables */
 
-		/* XXX: bss can't be omitted from the ELF image. */
+		/* bss can't be omitted from the ELF image. */
 		*(.bss);                /* uninitialized static variables */
 
Index: kernel/arch/ppc32/src/exception.S
===================================================================
--- kernel/arch/ppc32/src/exception.S	(revision deacd722f7dca626637926215ebe69ffd2fd67f5)
+++ kernel/arch/ppc32/src/exception.S	(revision 5071f8a8d049c5ec42cf8d3640c718d3cf19c5a6)
@@ -126,5 +126,5 @@
 .endm
 
-// XXX: K_UNMAPPED_TEXT_START section starts at 0x100,
+// NOTE: K_UNMAPPED_TEXT_START section starts at 0x100,
 // so all the following .org directives are relative to that.
 #define ABSOLUTE(x) ((x) - 0x100)