summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2018-07-31 07:39:32 -0400
committerMasahiro Yamada <yamada.masahiro@socionext.com>2018-08-01 19:06:54 -0400
commit87a4c375995ed8eaa721b08825cf73d0b02b3145 (patch)
treeb79c3056b713e8500c5c111a39dba655040a2bdb /arch
parent06ec64b84c357693e9a5540de8eedfc775dbae12 (diff)
kconfig: include kernel/Kconfig.preempt from init/Kconfig
Almost all architectures include it. Add a ARCH_NO_PREEMPT symbol to disable preempt support for alpha, hexagon, non-coldfire m68k and user mode Linux. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/Kconfig3
-rw-r--r--arch/alpha/Kconfig1
-rw-r--r--arch/arc/Kconfig2
-rw-r--r--arch/arm/Kconfig2
-rw-r--r--arch/arm64/Kconfig1
-rw-r--r--arch/c6x/Kconfig2
-rw-r--r--arch/h8300/Kconfig6
-rw-r--r--arch/hexagon/Kconfig1
-rw-r--r--arch/ia64/Kconfig2
-rw-r--r--arch/m68k/Kconfig5
-rw-r--r--arch/microblaze/Kconfig2
-rw-r--r--arch/mips/Kconfig2
-rw-r--r--arch/nds32/Kconfig1
-rw-r--r--arch/nios2/Kconfig2
-rw-r--r--arch/openrisc/Kconfig1
-rw-r--r--arch/parisc/Kconfig1
-rw-r--r--arch/powerpc/Kconfig1
-rw-r--r--arch/riscv/Kconfig2
-rw-r--r--arch/s390/Kconfig2
-rw-r--r--arch/sh/Kconfig2
-rw-r--r--arch/sparc/Kconfig2
-rw-r--r--arch/um/Kconfig1
-rw-r--r--arch/unicore32/Kconfig2
-rw-r--r--arch/x86/Kconfig2
-rw-r--r--arch/xtensa/Kconfig2
25 files changed, 7 insertions, 43 deletions
diff --git a/arch/Kconfig b/arch/Kconfig
index 09a561a70168..cddd0faae4cb 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -881,6 +881,9 @@ config COMPAT_32BIT_TIME
881config ARCH_NO_COHERENT_DMA_MMAP 881config ARCH_NO_COHERENT_DMA_MMAP
882 bool 882 bool
883 883
884config ARCH_NO_PREEMPT
885 bool
886
884config CPU_NO_EFFICIENT_FFS 887config CPU_NO_EFFICIENT_FFS
885 def_bool n 888 def_bool n
886 889
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index e4334f017f8e..5b4f88363453 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -4,6 +4,7 @@ config ALPHA
4 default y 4 default y
5 select ARCH_MIGHT_HAVE_PC_PARPORT 5 select ARCH_MIGHT_HAVE_PC_PARPORT
6 select ARCH_MIGHT_HAVE_PC_SERIO 6 select ARCH_MIGHT_HAVE_PC_SERIO
7 select ARCH_NO_PREEMPT
7 select ARCH_USE_CMPXCHG_LOCKREF 8 select ARCH_USE_CMPXCHG_LOCKREF
8 select HAVE_AOUT 9 select HAVE_AOUT
9 select HAVE_IDE 10 select HAVE_IDE
diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
index 5aab069eba17..639ab1bed835 100644
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@ -545,8 +545,6 @@ config ARC_BUILTIN_DTB_NAME
545 Set the name of the DTB to embed in the vmlinux binary 545 Set the name of the DTB to embed in the vmlinux binary
546 Leaving it blank selects the minimal "skeleton" dtb 546 Leaving it blank selects the minimal "skeleton" dtb
547 547
548source "kernel/Kconfig.preempt"
549
550endmenu # "ARC Architecture Configuration" 548endmenu # "ARC Architecture Configuration"
551 549
552config FORCE_MAX_ZONEORDER 550config FORCE_MAX_ZONEORDER
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 9aaa23c25374..1b1c21519039 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1481,8 +1481,6 @@ config ARCH_NR_GPIO
1481 1481
1482 If unsure, leave the default value. 1482 If unsure, leave the default value.
1483 1483
1484source kernel/Kconfig.preempt
1485
1486config HZ_FIXED 1484config HZ_FIXED
1487 int 1485 int
1488 default 200 if ARCH_EBSA110 1486 default 200 if ARCH_EBSA110
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 07d457ec417a..daf59d363dd3 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -752,7 +752,6 @@ config HOLES_IN_ZONE
752 def_bool y 752 def_bool y
753 depends on NUMA 753 depends on NUMA
754 754
755source kernel/Kconfig.preempt
756source kernel/Kconfig.hz 755source kernel/Kconfig.hz
757 756
758config ARCH_SUPPORTS_DEBUG_PAGEALLOC 757config ARCH_SUPPORTS_DEBUG_PAGEALLOC
diff --git a/arch/c6x/Kconfig b/arch/c6x/Kconfig
index 904b3375331e..a641b0bf1611 100644
--- a/arch/c6x/Kconfig
+++ b/arch/c6x/Kconfig
@@ -110,8 +110,6 @@ config KERNEL_RAM_BASE_ADDRESS
110 default 0xe0000000 if SOC_TMS320C6472 110 default 0xe0000000 if SOC_TMS320C6472
111 default 0x80000000 111 default 0x80000000
112 112
113source "kernel/Kconfig.preempt"
114
115source "kernel/Kconfig.hz" 113source "kernel/Kconfig.hz"
116 114
117endmenu 115endmenu
diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index c16e7cf732f7..5e89d40be8cd 100644
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -49,9 +49,3 @@ config NR_CPUS
49 default 1 49 default 1
50 50
51source "arch/h8300/Kconfig.cpu" 51source "arch/h8300/Kconfig.cpu"
52
53menu "Kernel Features"
54
55source "kernel/Kconfig.preempt"
56
57endmenu
diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig
index fcdb6d9fcecc..89a4b22f34d9 100644
--- a/arch/hexagon/Kconfig
+++ b/arch/hexagon/Kconfig
@@ -4,6 +4,7 @@ comment "Linux Kernel Configuration for Hexagon"
4 4
5config HEXAGON 5config HEXAGON
6 def_bool y 6 def_bool y
7 select ARCH_NO_PREEMPT
7 select HAVE_OPROFILE 8 select HAVE_OPROFILE
8 # Other pending projects/to-do items. 9 # Other pending projects/to-do items.
9 # select HAVE_REGS_AND_STACK_ACCESS_API 10 # select HAVE_REGS_AND_STACK_ACCESS_API
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 34a8d24cffea..86bd377bc7c0 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -364,8 +364,6 @@ config FORCE_CPEI_RETARGET
364 This option it useful to enable this feature on older BIOS's as well. 364 This option it useful to enable this feature on older BIOS's as well.
365 You can also enable this by using boot command line option force_cpei=1. 365 You can also enable this by using boot command line option force_cpei=1.
366 366
367source "kernel/Kconfig.preempt"
368
369config ARCH_SELECT_MEMORY_MODEL 367config ARCH_SELECT_MEMORY_MODEL
370 def_bool y 368 def_bool y
371 369
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index cf41ad45513f..3e47f8df6504 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -4,6 +4,7 @@ config M68K
4 default y 4 default y
5 select ARCH_MIGHT_HAVE_PC_PARPORT if ISA 5 select ARCH_MIGHT_HAVE_PC_PARPORT if ISA
6 select ARCH_NO_COHERENT_DMA_MMAP if !MMU 6 select ARCH_NO_COHERENT_DMA_MMAP if !MMU
7 select ARCH_NO_PREEMPT if !COLDFIRE
7 select HAVE_IDE 8 select HAVE_IDE
8 select HAVE_AOUT if MMU 9 select HAVE_AOUT if MMU
9 select HAVE_DEBUG_BUGVERBOSE 10 select HAVE_DEBUG_BUGVERBOSE
@@ -129,10 +130,6 @@ endmenu
129 130
130menu "Kernel Features" 131menu "Kernel Features"
131 132
132if COLDFIRE
133source "kernel/Kconfig.preempt"
134endif
135
136endmenu 133endmenu
137 134
138if !MMU 135if !MMU
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index f4492e9478fe..6163a39ddeb6 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -87,8 +87,6 @@ source "arch/microblaze/Kconfig.platform"
87 87
88menu "Processor type and features" 88menu "Processor type and features"
89 89
90source "kernel/Kconfig.preempt"
91
92source "kernel/Kconfig.hz" 90source "kernel/Kconfig.hz"
93 91
94config MMU 92config MMU
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index ab02824c3976..06a633eb9777 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2818,8 +2818,6 @@ config HZ
2818config SCHED_HRTICK 2818config SCHED_HRTICK
2819 def_bool HIGH_RES_TIMERS 2819 def_bool HIGH_RES_TIMERS
2820 2820
2821source "kernel/Kconfig.preempt"
2822
2823config KEXEC 2821config KEXEC
2824 bool "Kexec system call" 2822 bool "Kexec system call"
2825 select KEXEC_CORE 2823 select KEXEC_CORE
diff --git a/arch/nds32/Kconfig b/arch/nds32/Kconfig
index c03d0e5a591b..541f16adfb06 100644
--- a/arch/nds32/Kconfig
+++ b/arch/nds32/Kconfig
@@ -88,6 +88,5 @@ config NDS32_BUILTIN_DTB
88endmenu 88endmenu
89 89
90menu "Kernel Features" 90menu "Kernel Features"
91source "kernel/Kconfig.preempt"
92source "kernel/Kconfig.hz" 91source "kernel/Kconfig.hz"
93endmenu 92endmenu
diff --git a/arch/nios2/Kconfig b/arch/nios2/Kconfig
index 22d19febcc92..cbe1844b0657 100644
--- a/arch/nios2/Kconfig
+++ b/arch/nios2/Kconfig
@@ -47,8 +47,6 @@ config TRACE_IRQFLAGS_SUPPORT
47 47
48menu "Kernel features" 48menu "Kernel features"
49 49
50source "kernel/Kconfig.preempt"
51
52source "kernel/Kconfig.hz" 50source "kernel/Kconfig.hz"
53 51
54config FORCE_MAX_ZONEORDER 52config FORCE_MAX_ZONEORDER
diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig
index c52cecd94d62..42e3a0f2afab 100644
--- a/arch/openrisc/Kconfig
+++ b/arch/openrisc/Kconfig
@@ -143,7 +143,6 @@ config SMP
143 If you don't know what to do here, say N. 143 If you don't know what to do here, say N.
144 144
145source kernel/Kconfig.hz 145source kernel/Kconfig.hz
146source kernel/Kconfig.preempt
147 146
148config OPENRISC_NO_SPR_SR_DSX 147config OPENRISC_NO_SPR_SR_DSX
149 bool "use SPR_SR_DSX software emulation" if OR1K_1200 148 bool "use SPR_SR_DSX software emulation" if OR1K_1200
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index d1dd56ea297b..89496aa318da 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -323,7 +323,6 @@ config NODES_SHIFT
323 default "3" 323 default "3"
324 depends on NEED_MULTIPLE_NODES 324 depends on NEED_MULTIPLE_NODES
325 325
326source "kernel/Kconfig.preempt"
327source "kernel/Kconfig.hz" 326source "kernel/Kconfig.hz"
328 327
329config COMPAT 328config COMPAT
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index c55e61302d57..1c10ff0406f2 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -393,7 +393,6 @@ config HIGHMEM
393 depends on PPC32 393 depends on PPC32
394 394
395source kernel/Kconfig.hz 395source kernel/Kconfig.hz
396source kernel/Kconfig.preempt
397 396
398config HUGETLB_PAGE_SIZE_VARIABLE 397config HUGETLB_PAGE_SIZE_VARIABLE
399 bool 398 bool
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index 73c0e16793fa..a344980287a5 100644
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -212,8 +212,6 @@ endmenu
212 212
213menu "Kernel type" 213menu "Kernel type"
214 214
215source "kernel/Kconfig.preempt"
216
217source "kernel/Kconfig.hz" 215source "kernel/Kconfig.hz"
218 216
219endmenu 217endmenu
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index ac8925766d0a..8441bd8f7d70 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -511,8 +511,6 @@ config SCHED_TOPOLOGY
511 making when dealing with machines that have multi-threading, 511 making when dealing with machines that have multi-threading,
512 multiple cores or multiple books. 512 multiple cores or multiple books.
513 513
514source kernel/Kconfig.preempt
515
516source kernel/Kconfig.hz 514source kernel/Kconfig.hz
517 515
518config KEXEC 516config KEXEC
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index c8460330eff7..993f61a5961d 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -709,8 +709,6 @@ config HOTPLUG_CPU
709 Say Y here to experiment with turning CPUs off and on. CPUs 709 Say Y here to experiment with turning CPUs off and on. CPUs
710 can be controlled through /sys/devices/system/cpu. 710 can be controlled through /sys/devices/system/cpu.
711 711
712source "kernel/Kconfig.preempt"
713
714config GUSA 712config GUSA
715 def_bool y 713 def_bool y
716 depends on !SMP && SUPERH32 714 depends on !SMP && SUPERH32
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 622695e8fa44..2d58c26bff9a 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -349,8 +349,6 @@ config SCHED_MC
349 making when dealing with multi-core CPU chips at a cost of slightly 349 making when dealing with multi-core CPU chips at a cost of slightly
350 increased overhead in some places. If unsure say N here. 350 increased overhead in some places. If unsure say N here.
351 351
352source "kernel/Kconfig.preempt"
353
354config CMDLINE_BOOL 352config CMDLINE_BOOL
355 bool "Default bootloader kernel arguments" 353 bool "Default bootloader kernel arguments"
356 depends on SPARC64 354 depends on SPARC64
diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index 3022d1bf9bf9..6b9938919f0b 100644
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -6,6 +6,7 @@ config UML
6 bool 6 bool
7 default y 7 default y
8 select ARCH_HAS_KCOV 8 select ARCH_HAS_KCOV
9 select ARCH_NO_PREEMPT
9 select HAVE_ARCH_AUDITSYSCALL 10 select HAVE_ARCH_AUDITSYSCALL
10 select HAVE_ARCH_SECCOMP_FILTER 11 select HAVE_ARCH_SECCOMP_FILTER
11 select HAVE_UID16 12 select HAVE_UID16
diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig
index 6bfaa4a910e1..60eae744d8fd 100644
--- a/arch/unicore32/Kconfig
+++ b/arch/unicore32/Kconfig
@@ -135,8 +135,6 @@ endmenu
135 135
136menu "Kernel Features" 136menu "Kernel Features"
137 137
138source "kernel/Kconfig.preempt"
139
140source "kernel/Kconfig.hz" 138source "kernel/Kconfig.hz"
141 139
142config LEDS 140config LEDS
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 41d28b430fef..98fd04cfa995 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1039,8 +1039,6 @@ config SCHED_MC_PRIO
1039 1039
1040 If unsure say Y here. 1040 If unsure say Y here.
1041 1041
1042source "kernel/Kconfig.preempt"
1043
1044config UP_LATE_INIT 1042config UP_LATE_INIT
1045 def_bool y 1043 def_bool y
1046 depends on !SMP && X86_LOCAL_APIC 1044 depends on !SMP && X86_LOCAL_APIC
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index aae0e1800be7..801491e98890 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -173,8 +173,6 @@ config XTENSA_UNALIGNED_USER
173 173
174 Say Y here to enable unaligned memory access in user space. 174 Say Y here to enable unaligned memory access in user space.
175 175
176source "kernel/Kconfig.preempt"
177
178config HAVE_SMP 176config HAVE_SMP
179 bool "System Supports SMP (MX)" 177 bool "System Supports SMP (MX)"
180 depends on XTENSA_VARIANT_CUSTOM 178 depends on XTENSA_VARIANT_CUSTOM
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-22 11:23:07 -0500