diff --git a/sys/crypto/blowfish/arch/i386/bf_enc_586.S b/sys/crypto/blowfish/arch/i386/bf_enc_586.S
index f6b3cef880d..680b2e5812e 100644
--- a/sys/crypto/blowfish/arch/i386/bf_enc_586.S
+++ b/sys/crypto/blowfish/arch/i386/bf_enc_586.S
@@ -399,7 +399,7 @@ ENTRY(BF_encrypt)
 	xorl	%eax,		%ebx
 	movl	3144(%ebp,%edx,4),%edx
 	addl	%edx,		%ebx
-	# Load parameter 0 (16) enc=1 
+	/* Load parameter 0 (16) enc=1 */
 	movl	20(%esp),	%eax
 	xorl	%ebx,		%edi
 	movl	68(%ebp),	%edx
@@ -421,7 +421,7 @@ ENTRY(BF_decrypt)
 	movl	16(%esp),	%ebp
 	pushl	%esi
 	pushl	%edi
-	# Load the 2 words 
+	/* Load the 2 words */
 	movl	(%ebx),		%edi
 	movl	4(%ebx),	%esi
 	xorl	%eax,		%eax
@@ -746,7 +746,7 @@ ENTRY(BF_decrypt)
 	xorl	%eax,		%ebx
 	movl	3144(%ebp,%edx,4),%edx
 	addl	%edx,		%ebx
-	# Load parameter 0 (1) enc=0 
+	/* Load parameter 0 (1) enc=0 */
 	movl	20(%esp),	%eax
 	xorl	%ebx,		%edi
 	movl	(%ebp),		%edx
diff --git a/sys/crypto/des/arch/i386/des_enc.S b/sys/crypto/des/arch/i386/des_enc.S
index ed49a0b00f1..7fc29e678a4 100644
--- a/sys/crypto/des/arch/i386/des_enc.S
+++ b/sys/crypto/des/arch/i386/des_enc.S
@@ -70,7 +70,7 @@ ENTRY(des_encrypt1)
 	pushl	%esi
 	pushl	%edi
 
-	# Load the 2 words 
+	/* Load the 2 words */
 	movl	12(%esp),	%esi
 	xorl	%ecx,		%ecx
 	pushl	%ebx
@@ -79,7 +79,7 @@ ENTRY(des_encrypt1)
 	movl	28(%esp),	%ebx
 	movl	4(%esi),	%edi
 
-	# IP 
+	/* IP */
 	roll	$4,		%eax
 	movl	%eax,		%esi
 	xorl	%edi,		%eax
@@ -121,7 +121,7 @@ ENTRY(des_encrypt1)
 	cmpl	$0,		%ebx
 	je	.L000start_decrypt
 
-	# Round 0 
+	/* Round 0 */
 	movl	(%ebp),		%eax
 	xorl	%ebx,		%ebx
 	movl	4(%ebp),	%edx
@@ -158,7 +158,7 @@ ENTRY(des_encrypt1)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 1 
+	/* Round 1 */
 	movl	8(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	12(%ebp),	%edx
@@ -195,7 +195,7 @@ ENTRY(des_encrypt1)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 2 
+	/* Round 2 */
 	movl	16(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	20(%ebp),	%edx
@@ -232,7 +232,7 @@ ENTRY(des_encrypt1)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 3 
+	/* Round 3 */
 	movl	24(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	28(%ebp),	%edx
@@ -269,7 +269,7 @@ ENTRY(des_encrypt1)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 4 
+	/* Round 4 */
 	movl	32(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	36(%ebp),	%edx
@@ -306,7 +306,7 @@ ENTRY(des_encrypt1)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 5 
+	/* Round 5 */
 	movl	40(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	44(%ebp),	%edx
@@ -343,7 +343,7 @@ ENTRY(des_encrypt1)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 6 
+	/* Round 6 */
 	movl	48(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	52(%ebp),	%edx
@@ -380,7 +380,7 @@ ENTRY(des_encrypt1)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 7 
+	/* Round 7 */
 	movl	56(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	60(%ebp),	%edx
@@ -417,7 +417,7 @@ ENTRY(des_encrypt1)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 8 
+	/* Round 8 */
 	movl	64(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	68(%ebp),	%edx
@@ -454,7 +454,7 @@ ENTRY(des_encrypt1)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 9 
+	/* Round 9 */
 	movl	72(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	76(%ebp),	%edx
@@ -491,7 +491,7 @@ ENTRY(des_encrypt1)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 10 
+	/* Round 10 */
 	movl	80(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	84(%ebp),	%edx
@@ -528,7 +528,7 @@ ENTRY(des_encrypt1)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 11 
+	/* Round 11 */
 	movl	88(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	92(%ebp),	%edx
@@ -565,7 +565,7 @@ ENTRY(des_encrypt1)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 12 
+	/* Round 12 */
 	movl	96(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	100(%ebp),	%edx
@@ -602,7 +602,7 @@ ENTRY(des_encrypt1)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 13 
+	/* Round 13 */
 	movl	104(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	108(%ebp),	%edx
@@ -639,7 +639,7 @@ ENTRY(des_encrypt1)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 14 
+	/* Round 14 */
 	movl	112(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	116(%ebp),	%edx
@@ -676,7 +676,7 @@ ENTRY(des_encrypt1)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 15 
+	/* Round 15 */
 	movl	120(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	124(%ebp),	%edx
@@ -715,7 +715,7 @@ ENTRY(des_encrypt1)
 	jmp	.L001end
 .L000start_decrypt:
 
-	# Round 15 
+	/* Round 15 */
 	movl	120(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	124(%ebp),	%edx
@@ -752,7 +752,7 @@ ENTRY(des_encrypt1)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 14 
+	/* Round 14 */
 	movl	112(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	116(%ebp),	%edx
@@ -789,7 +789,7 @@ ENTRY(des_encrypt1)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 13 
+	/* Round 13 */
 	movl	104(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	108(%ebp),	%edx
@@ -826,7 +826,7 @@ ENTRY(des_encrypt1)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 12 
+	/* Round 12 */
 	movl	96(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	100(%ebp),	%edx
@@ -863,7 +863,7 @@ ENTRY(des_encrypt1)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 11 
+	/* Round 11 */
 	movl	88(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	92(%ebp),	%edx
@@ -900,7 +900,7 @@ ENTRY(des_encrypt1)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 10 
+	/* Round 10 */
 	movl	80(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	84(%ebp),	%edx
@@ -937,7 +937,7 @@ ENTRY(des_encrypt1)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 9 
+	/* Round 9 */
 	movl	72(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	76(%ebp),	%edx
@@ -974,7 +974,7 @@ ENTRY(des_encrypt1)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 8 
+	/* Round 8 */
 	movl	64(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	68(%ebp),	%edx
@@ -1011,7 +1011,7 @@ ENTRY(des_encrypt1)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 7 
+	/* Round 7 */
 	movl	56(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	60(%ebp),	%edx
@@ -1048,7 +1048,7 @@ ENTRY(des_encrypt1)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 6 
+	/* Round 6 */
 	movl	48(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	52(%ebp),	%edx
@@ -1085,7 +1085,7 @@ ENTRY(des_encrypt1)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 5 
+	/* Round 5 */
 	movl	40(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	44(%ebp),	%edx
@@ -1122,7 +1122,7 @@ ENTRY(des_encrypt1)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 4 
+	/* Round 4 */
 	movl	32(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	36(%ebp),	%edx
@@ -1159,7 +1159,7 @@ ENTRY(des_encrypt1)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 3 
+	/* Round 3 */
 	movl	24(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	28(%ebp),	%edx
@@ -1196,7 +1196,7 @@ ENTRY(des_encrypt1)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 2 
+	/* Round 2 */
 	movl	16(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	20(%ebp),	%edx
@@ -1233,7 +1233,7 @@ ENTRY(des_encrypt1)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 1 
+	/* Round 1 */
 	movl	8(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	12(%ebp),	%edx
@@ -1270,7 +1270,7 @@ ENTRY(des_encrypt1)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 0 
+	/* Round 0 */
 	movl	(%ebp),		%eax
 	xorl	%ebx,		%ebx
 	movl	4(%ebp),	%edx
@@ -1308,7 +1308,7 @@ ENTRY(des_encrypt1)
 	xorl	%ebx,		%esi
 .L001end:
 
-	# FP 
+	/* FP */
 	movl	20(%esp),	%edx
 .byte 209
 .byte 206		# rorl $1 %esi 
@@ -1361,7 +1361,7 @@ ENTRY(des_encrypt2)
 	pushl	%esi
 	pushl	%edi
 
-	# Load the 2 words 
+	/* Load the 2 words */
 	movl	12(%esp),	%eax
 	xorl	%ecx,		%ecx
 	pushl	%ebx
@@ -1375,7 +1375,7 @@ ENTRY(des_encrypt2)
 	cmpl	$0,		%ebx
 	je	.L002start_decrypt
 
-	# Round 0 
+	/* Round 0 */
 	movl	(%ebp),		%eax
 	xorl	%ebx,		%ebx
 	movl	4(%ebp),	%edx
@@ -1412,7 +1412,7 @@ ENTRY(des_encrypt2)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 1 
+	/* Round 1 */
 	movl	8(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	12(%ebp),	%edx
@@ -1449,7 +1449,7 @@ ENTRY(des_encrypt2)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 2 
+	/* Round 2 */
 	movl	16(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	20(%ebp),	%edx
@@ -1486,7 +1486,7 @@ ENTRY(des_encrypt2)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 3 
+	/* Round 3 */
 	movl	24(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	28(%ebp),	%edx
@@ -1523,7 +1523,7 @@ ENTRY(des_encrypt2)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 4 
+	/* Round 4 */
 	movl	32(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	36(%ebp),	%edx
@@ -1560,7 +1560,7 @@ ENTRY(des_encrypt2)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 5 
+	/* Round 5 */
 	movl	40(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	44(%ebp),	%edx
@@ -1597,7 +1597,7 @@ ENTRY(des_encrypt2)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 6 
+	/* Round 6 */
 	movl	48(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	52(%ebp),	%edx
@@ -1634,7 +1634,7 @@ ENTRY(des_encrypt2)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 7 
+	/* Round 7 */
 	movl	56(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	60(%ebp),	%edx
@@ -1671,7 +1671,7 @@ ENTRY(des_encrypt2)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 8 
+	/* Round 8 */
 	movl	64(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	68(%ebp),	%edx
@@ -1708,7 +1708,7 @@ ENTRY(des_encrypt2)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 9 
+	/* Round 9 */
 	movl	72(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	76(%ebp),	%edx
@@ -1745,7 +1745,7 @@ ENTRY(des_encrypt2)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 10 
+	/* Round 10 */
 	movl	80(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	84(%ebp),	%edx
@@ -1782,7 +1782,7 @@ ENTRY(des_encrypt2)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 11 
+	/* Round 11 */
 	movl	88(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	92(%ebp),	%edx
@@ -1819,7 +1819,7 @@ ENTRY(des_encrypt2)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 12 
+	/* Round 12 */
 	movl	96(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	100(%ebp),	%edx
@@ -1856,7 +1856,7 @@ ENTRY(des_encrypt2)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 13 
+	/* Round 13 */
 	movl	104(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	108(%ebp),	%edx
@@ -1893,7 +1893,7 @@ ENTRY(des_encrypt2)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 14 
+	/* Round 14 */
 	movl	112(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	116(%ebp),	%edx
@@ -1930,7 +1930,7 @@ ENTRY(des_encrypt2)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 15 
+	/* Round 15 */
 	movl	120(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	124(%ebp),	%edx
@@ -1969,7 +1969,7 @@ ENTRY(des_encrypt2)
 	jmp	.L003end
 .L002start_decrypt:
 
-	# Round 15 
+	/* Round 15 */
 	movl	120(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	124(%ebp),	%edx
@@ -2006,7 +2006,7 @@ ENTRY(des_encrypt2)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 14 
+	/* Round 14 */
 	movl	112(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	116(%ebp),	%edx
@@ -2043,7 +2043,7 @@ ENTRY(des_encrypt2)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 13 
+	/* Round 13 */
 	movl	104(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	108(%ebp),	%edx
@@ -2080,7 +2080,7 @@ ENTRY(des_encrypt2)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 12 
+	/* Round 12 */
 	movl	96(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	100(%ebp),	%edx
@@ -2117,7 +2117,7 @@ ENTRY(des_encrypt2)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 11 
+	/* Round 11 */
 	movl	88(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	92(%ebp),	%edx
@@ -2154,7 +2154,7 @@ ENTRY(des_encrypt2)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 10 
+	/* Round 10 */
 	movl	80(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	84(%ebp),	%edx
@@ -2191,7 +2191,7 @@ ENTRY(des_encrypt2)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 9 
+	/* Round 9 */
 	movl	72(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	76(%ebp),	%edx
@@ -2228,7 +2228,7 @@ ENTRY(des_encrypt2)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 8 
+	/* Round 8 */
 	movl	64(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	68(%ebp),	%edx
@@ -2265,7 +2265,7 @@ ENTRY(des_encrypt2)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 7 
+	/* Round 7 */
 	movl	56(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	60(%ebp),	%edx
@@ -2302,7 +2302,7 @@ ENTRY(des_encrypt2)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 6 
+	/* Round 6 */
 	movl	48(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	52(%ebp),	%edx
@@ -2339,7 +2339,7 @@ ENTRY(des_encrypt2)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 5 
+	/* Round 5 */
 	movl	40(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	44(%ebp),	%edx
@@ -2376,7 +2376,7 @@ ENTRY(des_encrypt2)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 4 
+	/* Round 4 */
 	movl	32(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	36(%ebp),	%edx
@@ -2413,7 +2413,7 @@ ENTRY(des_encrypt2)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 3 
+	/* Round 3 */
 	movl	24(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	28(%ebp),	%edx
@@ -2450,7 +2450,7 @@ ENTRY(des_encrypt2)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 2 
+	/* Round 2 */
 	movl	16(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	20(%ebp),	%edx
@@ -2487,7 +2487,7 @@ ENTRY(des_encrypt2)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%esi
 
-	# Round 1 
+	/* Round 1 */
 	movl	8(%ebp),	%eax
 	xorl	%ebx,		%ebx
 	movl	12(%ebp),	%edx
@@ -2524,7 +2524,7 @@ ENTRY(des_encrypt2)
 	movl	0x500+_C_LABEL(des_SPtrans)(%edx),%ebx
 	xorl	%ebx,		%edi
 
-	# Round 0 
+	/* Round 0 */
 	movl	(%ebp),		%eax
 	xorl	%ebx,		%ebx
 	movl	4(%ebp),	%edx
@@ -2562,7 +2562,7 @@ ENTRY(des_encrypt2)
 	xorl	%ebx,		%esi
 .L003end:
 
-	# Fixup 
+	/* Fixup */
 	rorl	$3,		%edi
 	movl	20(%esp),	%eax
 	rorl	$3,		%esi
@@ -2583,12 +2583,12 @@ ENTRY(des_encrypt3)
 	pushl   %esi
 	pushl   %edi
 
-	# Load the data words 
+	/* Load the data words */
 	movl    (%ebx),         %edi
 	movl    4(%ebx),        %esi
 	subl    $12,            %esp
 
-	# IP 
+	/* IP */
 	roll    $4,             %edi
 	movl    %edi,           %edx
 	xorl    %esi,           %edi
@@ -2647,7 +2647,7 @@ ENTRY(des_encrypt3)
 	movl    (%ebx),         %edi
 	movl    4(%ebx),        %esi
 
-	# FP 
+	/* FP */
 	roll    $2,             %esi
 	roll    $3,             %edi
 	movl    %edi,           %eax
@@ -2702,12 +2702,12 @@ ENTRY(des_decrypt3)
 	pushl   %esi
 	pushl   %edi
 
-	# Load the data words 
+	/* Load the data words */
 	movl    (%ebx),         %edi
 	movl    4(%ebx),        %esi
 	subl    $12,            %esp
 
-	# IP 
+	/* IP */
 	roll    $4,             %edi
 	movl    %edi,           %edx
 	xorl    %esi,           %edi
@@ -2766,7 +2766,7 @@ ENTRY(des_decrypt3)
 	movl    (%ebx),         %edi
 	movl    4(%ebx),        %esi
 
-	# FP 
+	/* FP */
 	roll    $2,             %esi
 	roll    $3,             %edi
 	movl    %edi,           %eax
diff --git a/sys/i386/svr4/svr4_locore.s b/sys/i386/svr4/svr4_locore.s
index 9f8b4aae6d1..6274ad2012b 100644
--- a/sys/i386/svr4/svr4_locore.s
+++ b/sys/i386/svr4/svr4_locore.s
@@ -7,8 +7,8 @@
 	
 NON_GPROF_ENTRY(svr4_sigcode)
 	call	*SVR4_SIGF_HANDLER(%esp)
-	leal	SVR4_SIGF_UC(%esp),%eax	# ucp (the call may have clobbered the
-					# copy at SIGF_UCP(%esp))
+	leal	SVR4_SIGF_UC(%esp),%eax	/* ucp (the call may have clobbered the
+					   copy at SIGF_UCP(%esp)) */
 #ifdef VM86
 #warning "VM86 doesn't work yet - do you really want this?"
 	testl	$PSL_VM,SVR4_UC_EFLAGS(%eax)
@@ -30,4 +30,3 @@ svr4_szsigcode:
 	.long	svr4_esigcode - svr4_sigcode
 
 	.text
-