X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=arch%2Fx86%2FKconfig;h=80b7ba4056dbbb566841c1e1cbef9475730fe199;hb=40ccbf525e55fc6d1f3a88c1e98b13db4dd618db;hp=34517bf14ba45052c47359421380dba42e129308;hpb=506f1d07b310815d11527d3360b09d79d0bd59f1;p=linux-2.6

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 34517bf14b..80b7ba4056 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1,13 +1,25 @@
 # x86 configuration
+mainmenu "Linux Kernel Configuration for x86"
+
+# Select 32 or 64 bit
+config 64BIT
+	bool "64-bit kernel" if ARCH = "x86"
+	default ARCH = "x86_64"
+	help
+	  Say yes to build a 64-bit kernel - formerly known as x86_64
+	  Say no to build a 32-bit kernel - formerly known as i386
+
+config X86_32
+	def_bool !64BIT
+
+config X86_64
+	def_bool 64BIT
 
 ### Arch settings
 config X86
 	bool
 	default y
 
-config 64BIT
-	def_bool X86_64
-
 config GENERIC_TIME
 	bool
 	default y
@@ -100,8 +112,9 @@ config GENERIC_TIME_VSYSCALL
 	bool
 	default X86_64
 
-
-
+config ARCH_SUPPORTS_OPROFILE
+	bool
+	default y
 
 
 config ZONE_DMA32
@@ -136,7 +149,8 @@ config X86_SMP
 
 config X86_HT
 	bool
-	depends on SMP && !(X86_VISWS || X86_VOYAGER || MK8)
+	depends on SMP
+	depends on (X86_32 && !(X86_VISWS || X86_VOYAGER)) || (X86_64 && !MK8)
 	default y
 
 config X86_BIOS_REBOOT