Skip to contentSkip to conversation

x86: Kconfig cleanup with genericarch

PATCH Applied Yinghai Lu 2 participants 4 messages Jun 17, 2008 – Jun 19, 2008 x86

lore
Share & tools
lore

Yinghai Lu

author
#0 lore raw

PATCH 1/1 x86: Kconfig cleanup with genericarch

we already have summit and etc depends on genericarch, so use genericarch only

Signed-off-by Yinghai Lu <[email protected]>
arch/x86/Kconfig +5 -5
index 48b2143..ee63192 100644
@@ -428,7 +428,7 @@ config MEMTEST
 
 config ACPI_SRAT
 	def_bool y
-	depends on X86_32 && ACPI && NUMA && (X86_SUMMIT || X86_GENERICARCH)
+	depends on X86_32 && ACPI && NUMA && X86_GENERICARCH
 	select ACPI_NUMA
 
 config HAVE_ARCH_PARSE_SRAT

@@ -437,11 +437,11 @@ config HAVE_ARCH_PARSE_SRAT
 
 config X86_SUMMIT_NUMA
 	def_bool y
-	depends on X86_32 && NUMA && (X86_SUMMIT || X86_GENERICARCH)
+	depends on X86_32 && NUMA && X86_GENERICARCH
 
 config X86_CYCLONE_TIMER
 	def_bool y
-	depends on X86_32 && X86_SUMMIT || X86_GENERICARCH
+	depends on X86_GENERICARCH
 
 config ES7000_CLUSTERED_APIC
 	def_bool y

@@ -906,9 +906,9 @@ config X86_PAE
 config NUMA
 	bool "Numa Memory Allocation and Scheduler Support (EXPERIMENTAL)"
 	depends on SMP
-	depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_GENERICARCH || X86_SUMMIT && ACPI) && EXPERIMENTAL)
+	depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_BIGSMP || X86_SUMMIT && ACPI) && EXPERIMENTAL)
 	default n if X86_PC
-	default y if (X86_NUMAQ || X86_SUMMIT || X86_GENERICARCH)
+	default y if (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP)
 	help
 	  Enable NUMA (Non Uniform Memory Access) support.
 	  The kernel will try to allocate memory used by a CPU on the
Applied
#1 lore raw
Quoted 2 lines · Yinghai Lu

we already have summit and etc depends on genericarch, so use genericarch only

applied to tip/x86/mpparse, thanks.

Ingo

author
#2 lore raw

PATCH 1/1 x86: remove unused file after numaq etc depends on genericarch

In reply to Yinghai Lu

we don't need those mach_mpsech.h now.

Signed-off-by Yinghai Lu <[email protected]>
---
 include/asm-x86/mach-bigsmp/mach_mpspec.h |    8 --------
 include/asm-x86/mach-es7000/mach_mpspec.h |    8 --------
 include/asm-x86/mach-numaq/mach_mpspec.h  |    8 --------
 include/asm-x86/mach-summit/mach_mpspec.h |    9 ---------
 4 files changed, 33 deletions(-)
include/asm-x86/mach-bigsmp/mach_mpspec.h deleted +0 -8
Index: linux-2.6/include/asm-x86/mach-bigsmp/mach_mpspec.h
===================================================================
@@ -1,8 +0,0 @@
-#ifndef __ASM_MACH_MPSPEC_H
-#define __ASM_MACH_MPSPEC_H
-
-#define MAX_IRQ_SOURCES 256
-
-#define MAX_MP_BUSSES 32
-
-#endif /* __ASM_MACH_MPSPEC_H */
include/asm-x86/mach-es7000/mach_mpspec.h deleted +0 -8
Index: linux-2.6/include/asm-x86/mach-es7000/mach_mpspec.h
===================================================================
@@ -1,8 +0,0 @@
-#ifndef __ASM_MACH_MPSPEC_H
-#define __ASM_MACH_MPSPEC_H
-
-#define MAX_IRQ_SOURCES 256
-
-#define MAX_MP_BUSSES 256
-
-#endif /* __ASM_MACH_MPSPEC_H */
include/asm-x86/mach-numaq/mach_mpspec.h deleted +0 -8
Index: linux-2.6/include/asm-x86/mach-numaq/mach_mpspec.h
===================================================================
@@ -1,8 +0,0 @@
-#ifndef __ASM_MACH_MPSPEC_H
-#define __ASM_MACH_MPSPEC_H
-
-#define MAX_IRQ_SOURCES 512
-
-#define MAX_MP_BUSSES 32
-
-#endif /* __ASM_MACH_MPSPEC_H */
include/asm-x86/mach-summit/mach_mpspec.h deleted +0 -9
Index: linux-2.6/include/asm-x86/mach-summit/mach_mpspec.h
===================================================================
@@ -1,9 +0,0 @@
-#ifndef __ASM_MACH_MPSPEC_H
-#define __ASM_MACH_MPSPEC_H
-
-#define MAX_IRQ_SOURCES 256
-
-/* Maximum 256 PCI busses, plus 1 ISA bus in each of 4 cabinets. */
-#define MAX_MP_BUSSES 260
-
-#endif /* __ASM_MACH_MPSPEC_H */
Applied
#3 lore raw

Re: [PATCH] x86: remove unused file after numaq etc depends on genericarch

Quoted 10 lines · Yinghai Lu

we don't need those mach_mpsech.h now.

Signed-off-by Yinghai Lu <[email protected]>
---
 include/asm-x86/mach-bigsmp/mach_mpspec.h |    8 --------
 include/asm-x86/mach-es7000/mach_mpspec.h |    8 --------
 include/asm-x86/mach-numaq/mach_mpspec.h  |    8 --------
 include/asm-x86/mach-summit/mach_mpspec.h |    9 ---------
 4 files changed, 33 deletions(-)

applied to tip/x86/mpparse, thanks.

nice cleanup!

Ingo