Index: kernel/generic/src/proc/thread.c
===================================================================
--- kernel/generic/src/proc/thread.c	(revision 30b56d9814196a29138d75a9555cb10e287d85dd)
+++ kernel/generic/src/proc/thread.c	(revision c1b073b79d93be484c1277800ebe22a898153e70)
@@ -719,26 +719,12 @@
 		name = thread->name;
 
-#ifdef __32_BITS__
 	if (additional)
-		printf("%-8" PRIu64 " %10p %10p %9" PRIu64 "%c %9" PRIu64 "%c ",
+		printf("%-8" PRIu64 " %p %p %9" PRIu64 "%c %9" PRIu64 "%c ",
 		    thread->tid, thread->thread_code, thread->kstack,
 		    ucycles, usuffix, kcycles, ksuffix);
 	else
-		printf("%-8" PRIu64 " %-14s %10p %-8s %10p %-5" PRIu32 "\n",
+		printf("%-8" PRIu64 " %-14s %p %-8s %p %-5" PRIu32 "\n",
 		    thread->tid, name, thread, thread_states[thread->state],
 		    thread->task, thread->task->container);
-#endif
-
-#ifdef __64_BITS__
-	if (additional)
-		printf("%-8" PRIu64 " %18p %18p\n"
-		    "         %9" PRIu64 "%c %9" PRIu64 "%c ",
-		    thread->tid, thread->thread_code, thread->kstack,
-		    ucycles, usuffix, kcycles, ksuffix);
-	else
-		printf("%-8" PRIu64 " %-14s %18p %-8s %18p %-5" PRIu32 "\n",
-		    thread->tid, name, thread, thread_states[thread->state],
-		    thread->task, thread->task->container);
-#endif
 
 	if (additional) {
@@ -749,11 +735,5 @@
 
 		if (thread->state == Sleeping) {
-#ifdef __32_BITS__
-			printf(" %10p", thread->sleep_queue);
-#endif
-
-#ifdef __64_BITS__
-			printf(" %18p", thread->sleep_queue);
-#endif
+			printf(" %p", thread->sleep_queue);
 		}
 
@@ -774,21 +754,19 @@
 	irq_spinlock_lock(&threads_lock, true);
 
-#ifdef __32_BITS__
-	if (additional)
-		printf("[id    ] [code    ] [stack   ] [ucycles ] [kcycles ]"
-		    " [cpu] [waitqueue]\n");
-	else
-		printf("[id    ] [name        ] [address ] [state ] [task    ]"
-		    " [ctn]\n");
-#endif
-
-#ifdef __64_BITS__
-	if (additional) {
-		printf("[id    ] [code            ] [stack           ]\n"
-		    "         [ucycles ] [kcycles ] [cpu] [waitqueue       ]\n");
-	} else
-		printf("[id    ] [name        ] [address         ] [state ]"
-		    " [task            ] [ctn]\n");
-#endif
+	if (sizeof(void *) <= 4) {
+		if (additional)
+			printf("[id    ] [code    ] [stack   ] [ucycles ] [kcycles ]"
+			    " [cpu] [waitqueue]\n");
+		else
+			printf("[id    ] [name        ] [address ] [state ] [task    ]"
+			    " [ctn]\n");
+	} else {
+		if (additional) {
+			printf("[id    ] [code            ] [stack           ] [ucycles ] [kcycles ]"
+			    " [cpu] [waitqueue       ]\n");
+		} else
+			printf("[id    ] [name        ] [address         ] [state ]"
+			    " [task            ] [ctn]\n");
+	}
 
 	thread = thread_first();