diff options
Diffstat (limited to 'arch/um/defconfig')
-rw-r--r-- | arch/um/defconfig | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/arch/um/defconfig b/arch/um/defconfig index 1e0f677c2f46..f609edede065 100644 --- a/arch/um/defconfig +++ b/arch/um/defconfig | |||
@@ -12,9 +12,7 @@ CONFIG_IRQ_RELEASE_METHOD=y | |||
12 | # | 12 | # |
13 | # UML-specific options | 13 | # UML-specific options |
14 | # | 14 | # |
15 | # CONFIG_MODE_TT is not set | ||
16 | # CONFIG_STATIC_LINK is not set | 15 | # CONFIG_STATIC_LINK is not set |
17 | CONFIG_MODE_SKAS=y | ||
18 | 16 | ||
19 | # | 17 | # |
20 | # Host processor type and features | 18 | # Host processor type and features |
@@ -61,9 +59,6 @@ CONFIG_SEMAPHORE_SLEEPERS=y | |||
61 | # CONFIG_HOST_2G_2G is not set | 59 | # CONFIG_HOST_2G_2G is not set |
62 | CONFIG_TOP_ADDR=0xc0000000 | 60 | CONFIG_TOP_ADDR=0xc0000000 |
63 | # CONFIG_3_LEVEL_PGTABLES is not set | 61 | # CONFIG_3_LEVEL_PGTABLES is not set |
64 | CONFIG_STUB_CODE=0xbfffe000 | ||
65 | CONFIG_STUB_DATA=0xbffff000 | ||
66 | CONFIG_STUB_START=0xbfffe000 | ||
67 | CONFIG_ARCH_HAS_SC_SIGNALS=y | 62 | CONFIG_ARCH_HAS_SC_SIGNALS=y |
68 | CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA=y | 63 | CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA=y |
69 | CONFIG_GENERIC_HWEIGHT=y | 64 | CONFIG_GENERIC_HWEIGHT=y |
@@ -75,6 +70,9 @@ CONFIG_FLATMEM=y | |||
75 | CONFIG_FLAT_NODE_MEM_MAP=y | 70 | CONFIG_FLAT_NODE_MEM_MAP=y |
76 | # CONFIG_SPARSEMEM_STATIC is not set | 71 | # CONFIG_SPARSEMEM_STATIC is not set |
77 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 72 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
73 | CONFIG_TICK_ONESHOT=y | ||
74 | CONFIG_NO_HZ=y | ||
75 | CONFIG_HIGH_RES_TIMERS=y | ||
78 | CONFIG_LD_SCRIPT_DYN=y | 76 | CONFIG_LD_SCRIPT_DYN=y |
79 | CONFIG_NET=y | 77 | CONFIG_NET=y |
80 | CONFIG_BINFMT_ELF=y | 78 | CONFIG_BINFMT_ELF=y |
@@ -82,11 +80,10 @@ CONFIG_BINFMT_MISC=m | |||
82 | # CONFIG_HOSTFS is not set | 80 | # CONFIG_HOSTFS is not set |
83 | # CONFIG_HPPFS is not set | 81 | # CONFIG_HPPFS is not set |
84 | CONFIG_MCONSOLE=y | 82 | CONFIG_MCONSOLE=y |
85 | # CONFIG_MAGIC_SYSRQ is not set | 83 | CONFIG_MAGIC_SYSRQ=y |
86 | CONFIG_NEST_LEVEL=0 | 84 | CONFIG_NEST_LEVEL=0 |
87 | # CONFIG_HIGHMEM is not set | 85 | # CONFIG_HIGHMEM is not set |
88 | CONFIG_KERNEL_STACK_ORDER=0 | 86 | CONFIG_KERNEL_STACK_ORDER=0 |
89 | CONFIG_UML_REAL_TIME_CLOCK=y | ||
90 | 87 | ||
91 | # | 88 | # |
92 | # Code maturity level options | 89 | # Code maturity level options |