Skip to contentSkip to conversation

uml: fix processor selection to exclude unsupported processors and features

PATCH Paolo 'Blaisorblade' Giarrusso 1 participant 1 message Oct 15, 2006

lore
Share & tools
lore
#0 lore raw

Makes UML compile on any possible processor choice. The two problems were:

*) x86 code, when 386 is selected, checks at runtime boot_cpuflags, which we do
not have.
*) 3Dnow support for memcpy() et al. does not compile currently and fixing this
is not trivial, so simply disable it; with this change, if one selects MK7 UML compiles (while it did not).
Merged upstream.

arch/i386/Kconfig.cpu +2 -1
Index: linux-2.6.git/arch/i386/Kconfig.cpu
===================================================================
@@ -7,6 +7,7 @@ choice
 
 config M386
 	bool "386"
+	depends on !UML
 	---help---
 	  This is the processor type of your CPU. This information is used for
 	  optimizing purposes. In order to compile a kernel that can run on
@@ -301,7 +302,7 @@ config X86_USE_PPRO_CHECKSUM
 
 config X86_USE_3DNOW
 	bool
-	depends on MCYRIXIII || MK7 || MGEODE_LX
+	depends on (MCYRIXIII || MK7 || MGEODE_LX) && !UML
 	default y
 
 config X86_OOSTORE