Index: HelenOS.config
===================================================================
--- HelenOS.config	(revision 7f34182064fa93a69263014cb1b9789bf87da965)
+++ HelenOS.config	(revision 30e2bbabc6e6d2fb1df50ace4a1582aa7b8d4617)
@@ -139,5 +139,5 @@
 % User space architecture
 @ "mips32eb"
-! [PLATFORM=mips32&(MACHINE=bgxemul)] UARCH (choice)
+! [PLATFORM=mips32&MACHINE=bgxemul] UARCH (choice)
 
 % User space architecture
@@ -243,5 +243,8 @@
 
 % Fences
-! [(PLATFORM=ia32&(MACHINE=pentium4|MACHINE=core))|PLATFORM=amd64] CONFIG_FENCES_P4 (y)
+! [PLATFORM=ia32&(MACHINE=pentium4|MACHINE=core)] CONFIG_FENCES_P4 (y)
+
+% Fences
+! [PLATFORM=amd64] CONFIG_FENCES_P4 (y)
 
 % ACPI support
@@ -276,5 +279,8 @@
 
 % FPU support
-! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=ia64|PLATFORM=sparc64|(PLATFORM=mips32&(MACHINE=lgxemul|MACHINE=bgxemul))] CONFIG_FPU (y)
+! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=ia64|PLATFORM=sparc64] CONFIG_FPU (y)
+
+% FPU support
+! [PLATFORM=mips32&(MACHINE=lgxemul|MACHINE=bgxemul)] CONFIG_FPU (y)
 
 
@@ -285,5 +291,8 @@
 
 % Improved support for hyperthreading
-! [((PLATFORM=ia32&MACHINE!=athlon-xp&MACHINE!=athlon-mp&MACHINE!=pentium3)|PLATFORM=amd64)&CONFIG_SMP=y] CONFIG_HT (y/n)
+! [PLATFORM=amd64&CONFIG_SMP=y] CONFIG_HT (y/n)
+
+% Improved support for hyperthreading
+! [PLATFORM=ia32&MACHINE!=athlon-xp&MACHINE!=athlon-mp&MACHINE!=pentium3&CONFIG_SMP=y] CONFIG_HT (y/n)
 
 % Lazy FPU context switching
@@ -333,5 +342,5 @@
 
 % Framebuffer support
-! [(PLATFORM=mips32&MACHINE=lgxemul)|(PLATFORM=mips32&MACHINE=bgxemul)|(PLATFORM=ia32)|(PLATFORM=amd64)|(PLATFORM=arm32)|(PLATFORM=sparc64&MACHINE=us3)] CONFIG_FB (y/n)
+! [(PLATFORM=mips32&MACHINE=lgxemul)|(PLATFORM=mips32&MACHINE=bgxemul)|PLATFORM=ia32|PLATFORM=amd64|PLATFORM=arm32|(PLATFORM=sparc64&MACHINE=us3)] CONFIG_FB (y/n)
 
 % Framebuffer support