diff options
Diffstat (limited to 'arch/um/Kconfig.um')
-rw-r--r-- | arch/um/Kconfig.um | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/um/Kconfig.um b/arch/um/Kconfig.um index ec2b8da1aba4..b5e675e370c6 100644 --- a/arch/um/Kconfig.um +++ b/arch/um/Kconfig.um | |||
@@ -47,7 +47,7 @@ config HOSTFS | |||
47 | 47 | ||
48 | config HPPFS | 48 | config HPPFS |
49 | tristate "HoneyPot ProcFS (EXPERIMENTAL)" | 49 | tristate "HoneyPot ProcFS (EXPERIMENTAL)" |
50 | depends on EXPERIMENTAL | 50 | depends on EXPERIMENTAL && PROC_FS |
51 | help | 51 | help |
52 | hppfs (HoneyPot ProcFS) is a filesystem which allows UML /proc | 52 | hppfs (HoneyPot ProcFS) is a filesystem which allows UML /proc |
53 | entries to be overridden, removed, or fabricated from the host. | 53 | entries to be overridden, removed, or fabricated from the host. |
@@ -128,7 +128,7 @@ config NR_CPUS | |||
128 | 128 | ||
129 | config HIGHMEM | 129 | config HIGHMEM |
130 | bool "Highmem support (EXPERIMENTAL)" | 130 | bool "Highmem support (EXPERIMENTAL)" |
131 | depends on !64BIT && EXPERIMENTAL | 131 | depends on !64BIT && BROKEN |
132 | default n | 132 | default n |
133 | help | 133 | help |
134 | This was used to allow UML to run with big amounts of memory. | 134 | This was used to allow UML to run with big amounts of memory. |
@@ -147,3 +147,6 @@ config KERNEL_STACK_ORDER | |||
147 | This option determines the size of UML kernel stacks. They will | 147 | This option determines the size of UML kernel stacks. They will |
148 | be 1 << order pages. The default is OK unless you're running Valgrind | 148 | be 1 << order pages. The default is OK unless you're running Valgrind |
149 | on UML, in which case, set this to 3. | 149 | on UML, in which case, set this to 3. |
150 | |||
151 | config NO_DMA | ||
152 | def_bool y | ||