Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

x86/kconfig: Move 32-bit only arch Kconfig selects to 'config X86_32'

These are easier to read when they come next to the X86_32 config.

Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Ingo Molnar 8 years ago
parent
e76d21c40b
commit
341c787e34
1 changed files with 8 additions and 7 deletions
Split View Show Diff Stats
  1. 8 7
      arch/x86/Kconfig

+ 8 - 7
arch/x86/Kconfig
View File 

@@ -9,6 +9,14 @@ config 64BIT
 
 config X86_32
 
 	def_bool y
 
 	depends on !64BIT
 
+	# Options that are inherently 32-bit kernel only:
 
+	select ARCH_WANT_IPC_PARSE_VERSION
 
+	select CLKSRC_I8253
 
+	select CLONE_BACKWARDS
 
+	select HAVE_AOUT
 
+	select HAVE_GENERIC_DMA_COHERENT
 
+	select MODULES_USE_ELF_REL
 
+	select OLD_SIGACTION
 
 
 config X86_64
 
 	def_bool y
 
@@ -48,13 +56,10 @@ config X86
 
 	select ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH if SMP
 
 	select ARCH_WANTS_DYNAMIC_TASK_STRUCT
 
 	select ARCH_WANT_FRAME_POINTERS
 
-	select ARCH_WANT_IPC_PARSE_VERSION	if X86_32
 
 	select BUILDTIME_EXTABLE_SORT
 
 	select CLKEVT_I8253
 
-	select CLKSRC_I8253			if X86_32
 
 	select CLOCKSOURCE_VALIDATE_LAST_CYCLE
 
 	select CLOCKSOURCE_WATCHDOG
 
-	select CLONE_BACKWARDS			if X86_32
 
 	select COMPAT_OLD_SIGACTION		if IA32_EMULATION
 
 	select DCACHE_WORD_ACCESS
 
 	select EDAC_ATOMIC_SCRUB
 
@@ -77,7 +82,6 @@ config X86
 
 	select HAVE_ACPI_APEI			if ACPI
 
 	select HAVE_ACPI_APEI_NMI		if ACPI
 
 	select HAVE_ALIGNED_STRUCT_PAGE		if SLUB
 
-	select HAVE_AOUT			if X86_32
 
 	select HAVE_ARCH_AUDITSYSCALL
 
 	select HAVE_ARCH_HARDENED_USERCOPY
 
 	select HAVE_ARCH_HUGE_VMAP		if X86_64 || X86_PAE
 
@@ -113,7 +117,6 @@ config X86
 
 	select HAVE_FUNCTION_GRAPH_TRACER
 
 	select HAVE_FUNCTION_TRACER
 
 	select HAVE_GCC_PLUGINS
 
-	select HAVE_GENERIC_DMA_COHERENT	if X86_32
 
 	select HAVE_HW_BREAKPOINT
 
 	select HAVE_IDE
 
 	select HAVE_IOREMAP_PROT
 
@@ -148,8 +151,6 @@ config X86
 
 	select HAVE_USER_RETURN_NOTIFIER
 
 	select IRQ_FORCED_THREADING
 
 	select MODULES_USE_ELF_RELA		if X86_64
 
-	select MODULES_USE_ELF_REL		if X86_32
 
-	select OLD_SIGACTION			if X86_32
 
 	select OLD_SIGSUSPEND3			if X86_32 || IA32_EMULATION
 
 	select PERF_EVENTS
 
 	select RTC_LIB