adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

x86: allow more than 8 cpus to be used on 32-bit

Browse source 
X86_PC is the only remaining 'sub' architecture, so we dont need
it anymore.

This also cleans up a few spurious references to X86_PC in the
driver space - those certainly should be X86.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Yinghai Lu 2009-01-29 15:14:46 -08:00 committed by Ingo Molnar
parent fbeb2ca022
commit 4272ebfbef
9 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/x86/Kconfig
View file

@ -262,9 +262,6 @@ config X86_MPPARSE
For old smp systems that do not have proper acpi support. Newer systems For old smp systems that do not have proper acpi support. Newer systems
(esp with 64bit cpus) with acpi support, MADT and DSDT will override it (esp with 64bit cpus) with acpi support, MADT and DSDT will override it
config X86_PC
def_bool y
config X86_NON_STANDARD config X86_NON_STANDARD
bool "Support for non-standard x86 platforms" bool "Support for non-standard x86 platforms"
help help
@ -1019,7 +1016,6 @@ config NUMA
bool "Numa Memory Allocation and Scheduler Support" bool "Numa Memory Allocation and Scheduler Support"
depends on SMP depends on SMP
depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_BIGSMP || 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_BIGSMP) default y if (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP)
help help
Enable NUMA (Non Uniform Memory Access) support. Enable NUMA (Non Uniform Memory Access) support.
@ -1122,7 +1118,7 @@ config ARCH_SPARSEMEM_DEFAULT
config ARCH_SPARSEMEM_ENABLE config ARCH_SPARSEMEM_ENABLE
def_bool y def_bool y
depends on X86_64 || NUMA || (EXPERIMENTAL && X86_PC) || X86_32_NON_STANDARD depends on X86_64 || NUMA || (EXPERIMENTAL && X86_32) || X86_32_NON_STANDARD
select SPARSEMEM_STATIC if X86_32 select SPARSEMEM_STATIC if X86_32
select SPARSEMEM_VMEMMAP_ENABLE if X86_64 select SPARSEMEM_VMEMMAP_ENABLE if X86_64

1
arch/x86/configs/i386_defconfig
View file

@ -188,7 +188,6 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
CONFIG_SMP=y CONFIG_SMP=y
CONFIG_X86_FIND_SMP_CONFIG=y CONFIG_X86_FIND_SMP_CONFIG=y
CONFIG_X86_MPPARSE=y CONFIG_X86_MPPARSE=y
CONFIG_X86_PC=y
# CONFIG_X86_ELAN is not set # CONFIG_X86_ELAN is not set
# CONFIG_X86_VOYAGER is not set # CONFIG_X86_VOYAGER is not set
# CONFIG_X86_GENERICARCH is not set # CONFIG_X86_GENERICARCH is not set

1
arch/x86/configs/x86_64_defconfig
View file

@ -187,7 +187,6 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
CONFIG_SMP=y CONFIG_SMP=y
CONFIG_X86_FIND_SMP_CONFIG=y CONFIG_X86_FIND_SMP_CONFIG=y
CONFIG_X86_MPPARSE=y CONFIG_X86_MPPARSE=y
CONFIG_X86_PC=y
# CONFIG_X86_ELAN is not set # CONFIG_X86_ELAN is not set
# CONFIG_X86_VOYAGER is not set # CONFIG_X86_VOYAGER is not set
# CONFIG_X86_GENERICARCH is not set # CONFIG_X86_GENERICARCH is not set

2
arch/x86/kernel/smpboot.c
View file

@ -1000,7 +1000,7 @@ static int __init smp_sanity_check(unsigned max_cpus)
{ {
preempt_disable(); preempt_disable();
#if defined(CONFIG_X86_PC) && defined(CONFIG_X86_32) #ifndef CONFIG_X86_BIGSMP
if (def_to_bigsmp && nr_cpu_ids > 8) { if (def_to_bigsmp && nr_cpu_ids > 8) {
unsigned int cpu; unsigned int cpu;
unsigned nr; unsigned nr;

6
drivers/eisa/Kconfig
View file

@ -3,7 +3,7 @@
# #
config EISA_VLB_PRIMING config EISA_VLB_PRIMING
bool "Vesa Local Bus priming" bool "Vesa Local Bus priming"
depends on X86_PC && EISA depends on X86 && EISA
default n default n
---help--- ---help---
Activate this option if your system contains a Vesa Local Activate this option if your system contains a Vesa Local
@ -24,11 +24,11 @@ config EISA_PCI_EISA
When in doubt, say Y. When in doubt, say Y.
# Using EISA_VIRTUAL_ROOT on something other than an Alpha or # Using EISA_VIRTUAL_ROOT on something other than an Alpha or
# an X86_PC may lead to crashes... # an X86 may lead to crashes...
config EISA_VIRTUAL_ROOT config EISA_VIRTUAL_ROOT
bool "EISA virtual root device" bool "EISA virtual root device"
depends on EISA && (ALPHA || X86_PC) depends on EISA && (ALPHA || X86)
default y default y
---help--- ---help---
Activate this option if your system only have EISA bus Activate this option if your system only have EISA bus

4
drivers/input/keyboard/Kconfig
View file

@ -13,11 +13,11 @@ menuconfig INPUT_KEYBOARD
if INPUT_KEYBOARD if INPUT_KEYBOARD
config KEYBOARD_ATKBD config KEYBOARD_ATKBD
tristate "AT keyboard" if EMBEDDED || !X86_PC tristate "AT keyboard" if EMBEDDED || !X86
default y default y
select SERIO select SERIO
select SERIO_LIBPS2 select SERIO_LIBPS2
select SERIO_I8042 if X86_PC select SERIO_I8042 if X86
select SERIO_GSCPS2 if GSC select SERIO_GSCPS2 if GSC
help help
Say Y here if you want to use a standard AT or PS/2 keyboard. Usually Say Y here if you want to use a standard AT or PS/2 keyboard. Usually

2
drivers/input/mouse/Kconfig
View file

@ -17,7 +17,7 @@ config MOUSE_PS2
default y default y
select SERIO select SERIO
select SERIO_LIBPS2 select SERIO_LIBPS2
select SERIO_I8042 if X86_PC select SERIO_I8042 if X86
select SERIO_GSCPS2 if GSC select SERIO_GSCPS2 if GSC
help help
Say Y here if you have a PS/2 mouse connected to your system. This Say Y here if you have a PS/2 mouse connected to your system. This

2
drivers/mtd/nand/Kconfig
View file

@ -273,7 +273,7 @@ config MTD_NAND_CAFE
config MTD_NAND_CS553X config MTD_NAND_CS553X
tristate "NAND support for CS5535/CS5536 (AMD Geode companion chip)" tristate "NAND support for CS5535/CS5536 (AMD Geode companion chip)"
depends on X86_32 && (X86_PC || X86_32_NON_STANDARD) depends on X86_32
help help
The CS553x companion chips for the AMD Geode processor The CS553x companion chips for the AMD Geode processor
include NAND flash controllers with built-in hardware ECC include NAND flash controllers with built-in hardware ECC

2
sound/drivers/Kconfig
View file

@ -33,7 +33,7 @@ if SND_DRIVERS
config SND_PCSP config SND_PCSP
tristate "PC-Speaker support (READ HELP!)" tristate "PC-Speaker support (READ HELP!)"
depends on PCSPKR_PLATFORM && X86_PC && HIGH_RES_TIMERS depends on PCSPKR_PLATFORM && X86 && HIGH_RES_TIMERS
depends on INPUT depends on INPUT
depends on EXPERIMENTAL depends on EXPERIMENTAL
select SND_PCM select SND_PCM