diff --git a/sys/alpha/alpha/trap.c b/sys/alpha/alpha/trap.c
index af9be44ea56..a09c91be1dd 100644
--- a/sys/alpha/alpha/trap.c
+++ b/sys/alpha/alpha/trap.c
@@ -297,7 +297,8 @@ trap(a0, a1, a2, entry, framep)
 	if (user)  {
 		sticks = td->td_kse->ke_sticks;
 		td->td_frame = framep;
-#ifdef DIAGNOSTIC 			/* see the comment in ast() */
+#ifdef DIAGNOSTIC
+		/* see the comment in ast() */
 		if (td->td_ucred != NULL)
 			panic("trap(): thread got a ucred while in userspace");
 		td->td_ucred = td->td_ucred_cache;
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index b1561dc84ab..7f1e607afc1 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -255,7 +255,8 @@ trap(frame)
 
 		sticks = td->td_kse->ke_sticks;
 		td->td_frame = &frame;
-#ifdef DIAGNOSTIC 			/* see the comment in ast() */
+#ifdef DIAGNOSTIC
+		/* see the comment in ast() */
 		if (td->td_ucred != NULL)
 			panic("trap(): thread got a ucred while in userspace");
 		td->td_ucred = td->td_ucred_cache;
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c
index b1561dc84ab..7f1e607afc1 100644
--- a/sys/i386/i386/trap.c
+++ b/sys/i386/i386/trap.c
@@ -255,7 +255,8 @@ trap(frame)
 
 		sticks = td->td_kse->ke_sticks;
 		td->td_frame = &frame;
-#ifdef DIAGNOSTIC 			/* see the comment in ast() */
+#ifdef DIAGNOSTIC
+		/* see the comment in ast() */
 		if (td->td_ucred != NULL)
 			panic("trap(): thread got a ucred while in userspace");
 		td->td_ucred = td->td_ucred_cache;
diff --git a/sys/ia64/ia64/trap.c b/sys/ia64/ia64/trap.c
index bf5c2cd9987..18204351fa1 100644
--- a/sys/ia64/ia64/trap.c
+++ b/sys/ia64/ia64/trap.c
@@ -323,7 +323,8 @@ trap(int vector, int imm, struct trapframe *framep)
 	if (user) {
 		sticks = td->td_kse->ke_sticks;
 		td->td_frame = framep;
-#ifdef DIAGNOSTIC 			/* see the comment in ast() */
+#ifdef DIAGNOSTIC
+		/* see the comment in ast() */
 		if (td->td_ucred != NULL)
 			panic("trap(): thread got a ucred while in userspace");
 		td->td_ucred = td->td_ucred_cache;
diff --git a/sys/powerpc/aim/trap.c b/sys/powerpc/aim/trap.c
index 64cbf75ca7f..21888fa7923 100644
--- a/sys/powerpc/aim/trap.c
+++ b/sys/powerpc/aim/trap.c
@@ -226,7 +226,8 @@ trap(struct trapframe *frame)
 	if (user) {
 		sticks = td->td_kse->ke_sticks;
 		td->td_frame = frame;
-#ifdef DIAGNOSTIC 			/* see the comment in ast() */
+#ifdef DIAGNOSTIC
+		/* see the comment in ast() */
 		if (td->td_ucred != NULL)
 			panic("trap(): thread got a ucred while in userspace");
 		td->td_ucred = td->td_ucred_cache;
diff --git a/sys/powerpc/powerpc/trap.c b/sys/powerpc/powerpc/trap.c
index 64cbf75ca7f..21888fa7923 100644
--- a/sys/powerpc/powerpc/trap.c
+++ b/sys/powerpc/powerpc/trap.c
@@ -226,7 +226,8 @@ trap(struct trapframe *frame)
 	if (user) {
 		sticks = td->td_kse->ke_sticks;
 		td->td_frame = frame;
-#ifdef DIAGNOSTIC 			/* see the comment in ast() */
+#ifdef DIAGNOSTIC
+		/* see the comment in ast() */
 		if (td->td_ucred != NULL)
 			panic("trap(): thread got a ucred while in userspace");
 		td->td_ucred = td->td_ucred_cache;
diff --git a/sys/sparc64/sparc64/trap.c b/sys/sparc64/sparc64/trap.c
index 6302d45b4e1..466f3daea7d 100644
--- a/sys/sparc64/sparc64/trap.c
+++ b/sys/sparc64/sparc64/trap.c
@@ -175,7 +175,8 @@ trap(struct trapframe *tf)
 	if ((type & T_KERNEL) == 0) {
 		sticks = td->td_kse->ke_sticks;
 		td->td_frame = tf;
-#ifdef DIAGNOSTIC 			/* see the comment in ast() */
+#ifdef DIAGNOSTIC
+		/* see the comment in ast() */
 		if (td->td_ucred != NULL)
 			panic("trap(): thread got a ucred while in userspace");
 		td->td_ucred = td->td_ucred_cache;