projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
[powerpc.git]
/
arch
/
um
/
Kconfig
diff --git
a/arch/um/Kconfig
b/arch/um/Kconfig
index
3b5f47c
..
563301f
100644
(file)
--- a/
arch/um/Kconfig
+++ b/
arch/um/Kconfig
@@
-7,7
+7,6
@@
config UML
bool
default y
bool
default y
-# XXX: does UM have a mmu/swap?
config MMU
bool
default y
config MMU
bool
default y
@@
-36,12
+35,6
@@
config IRQ_RELEASE_METHOD
bool
default y
bool
default y
-menu "Host processor type and features"
-
-source "arch/i386/Kconfig.cpu"
-
-endmenu
-
menu "UML-specific options"
config MODE_TT
menu "UML-specific options"
config MODE_TT
@@
-209,7
+202,8
@@
config MAGIC_SYSRQ
config SMP
bool "Symmetric multi-processing support (EXPERIMENTAL)"
default n
config SMP
bool "Symmetric multi-processing support (EXPERIMENTAL)"
default n
- depends on (MODE_TT && EXPERIMENTAL && !SMP_BROKEN) || (BROKEN && SMP_BROKEN)
+ #SMP_BROKEN is for x86_64.
+ depends on MODE_TT && EXPERIMENTAL && (!SMP_BROKEN || (BROKEN && SMP_BROKEN))
help
This option enables UML SMP support.
It is NOT related to having a real SMP box. Not directly, at least.
help
This option enables UML SMP support.
It is NOT related to having a real SMP box. Not directly, at least.