Index: HelenOS.config
===================================================================
--- HelenOS.config	(revision 1090b8c5d547b44cb82f921d66261080be81ccc2)
+++ HelenOS.config	(revision c00589d744b4c2f8becc2dd1223b865d10f1e238)
@@ -291,10 +291,4 @@
 ! [CONFIG_DEBUG=y&CONFIG_SMP=y] CONFIG_DEBUG_SPINLOCK (y/n)
 
-% Improved support for hyperthreading
-! [PLATFORM=amd64&CONFIG_SMP=y] CONFIG_HT (y/n)
-
-% Improved support for hyperthreading
-! [PLATFORM=ia32&PROCESSOR!=athlon_xp&PROCESSOR!=athlon_mp&PROCESSOR!=pentium3&CONFIG_SMP=y] CONFIG_HT (y/n)
-
 % Lazy FPU context switching
 ! [CONFIG_FPU=y] CONFIG_FPU_LAZY (y/n)
Index: defaults/amd64/Makefile.config
===================================================================
--- defaults/amd64/Makefile.config	(revision 1090b8c5d547b44cb82f921d66261080be81ccc2)
+++ defaults/amd64/Makefile.config	(revision c00589d744b4c2f8becc2dd1223b865d10f1e238)
@@ -16,7 +16,4 @@
 # Support for SMP
 CONFIG_SMP = y
-
-# Improved support for hyperthreading
-CONFIG_HT = y
 
 # Lazy FPU context switching
Index: defaults/ia32/Makefile.config
===================================================================
--- defaults/ia32/Makefile.config	(revision 1090b8c5d547b44cb82f921d66261080be81ccc2)
+++ defaults/ia32/Makefile.config	(revision c00589d744b4c2f8becc2dd1223b865d10f1e238)
@@ -22,7 +22,4 @@
 # Support for SMP
 CONFIG_SMP = y
-
-# Improved support for hyperthreading
-CONFIG_HT = y
 
 # Lazy FPU context switching
Index: kernel/arch/amd64/include/atomic.h
===================================================================
--- kernel/arch/amd64/include/atomic.h	(revision 1090b8c5d547b44cb82f921d66261080be81ccc2)
+++ kernel/arch/amd64/include/atomic.h	(revision c00589d744b4c2f8becc2dd1223b865d10f1e238)
@@ -116,7 +116,5 @@
 	asm volatile (
 		"0:\n"
-#ifdef CONFIG_HT
 		"pause\n"
-#endif
 		"mov %[count], %[tmp]\n"
 		"testq %[tmp], %[tmp]\n"
Index: kernel/arch/ia32/include/atomic.h
===================================================================
--- kernel/arch/ia32/include/atomic.h	(revision 1090b8c5d547b44cb82f921d66261080be81ccc2)
+++ kernel/arch/ia32/include/atomic.h	(revision c00589d744b4c2f8becc2dd1223b865d10f1e238)
@@ -115,7 +115,5 @@
 	asm volatile (
 		"0:\n"
-#ifdef CONFIG_HT
 		"pause\n"        /* Pentium 4's HT love this instruction */
-#endif
 		"mov %[count], %[tmp]\n"
 		"testl %[tmp], %[tmp]\n"
Index: kernel/arch/ia32/src/atomic.S
===================================================================
--- kernel/arch/ia32/src/atomic.S	(revision 1090b8c5d547b44cb82f921d66261080be81ccc2)
+++ kernel/arch/ia32/src/atomic.S	(revision c00589d744b4c2f8becc2dd1223b865d10f1e238)
@@ -43,7 +43,5 @@
 
 0:	
-	#ifdef CONFIG_HT
 	pause			# Pentium 4's with HT love this instruction
-	#endif
 	movl (%ebx),%eax
 	testl %eax,%eax