Browse Source

[PATCH] uml: fix processor selection to exclude unsupported processors and features

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).

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Paolo 'Blaisorblade' Giarrusso 18 years ago
parent
commit
1b4ad242fc
1 changed files with 2 additions and 1 deletions
  1. 2 1
      arch/i386/Kconfig.cpu

+ 2 - 1
arch/i386/Kconfig.cpu

@@ -7,6 +7,7 @@ choice
 
 
 config M386
 config M386
 	bool "386"
 	bool "386"
+	depends on !UML
 	---help---
 	---help---
 	  This is the processor type of your CPU. This information is used for
 	  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
 	  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
 config X86_USE_3DNOW
 	bool
 	bool
-	depends on MCYRIXIII || MK7 || MGEODE_LX
+	depends on (MCYRIXIII || MK7 || MGEODE_LX) && !UML
 	default y
 	default y
 
 
 config X86_OOSTORE
 config X86_OOSTORE