Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4272ebfb authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

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



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: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent fbeb2ca0

arch/x86/Kconfig

+1 −5
Original line number Diff line number Diff line
@@ -262,9 +262,6 @@ config X86_MPPARSE 
	  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



config X86_PC

	def_bool y



config X86_NON_STANDARD

	bool "Support for non-standard x86 platforms"

	help
@@ -1019,7 +1016,6 @@ config NUMA 
	bool "Numa Memory Allocation and Scheduler Support"

	depends on SMP

	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)

	help

	  Enable NUMA (Non Uniform Memory Access) support.
@@ -1122,7 +1118,7 @@ config ARCH_SPARSEMEM_DEFAULT 


config ARCH_SPARSEMEM_ENABLE

	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_VMEMMAP_ENABLE if X86_64

arch/x86/configs/i386_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -188,7 +188,6 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 
CONFIG_SMP=y

CONFIG_X86_FIND_SMP_CONFIG=y

CONFIG_X86_MPPARSE=y

CONFIG_X86_PC=y

# CONFIG_X86_ELAN is not set

# CONFIG_X86_VOYAGER is not set

# CONFIG_X86_GENERICARCH is not set

arch/x86/configs/x86_64_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -187,7 +187,6 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 
CONFIG_SMP=y

CONFIG_X86_FIND_SMP_CONFIG=y

CONFIG_X86_MPPARSE=y

CONFIG_X86_PC=y

# CONFIG_X86_ELAN is not set

# CONFIG_X86_VOYAGER is not set

# CONFIG_X86_GENERICARCH is not set

arch/x86/kernel/smpboot.c

+1 −1
Original line number Diff line number Diff line
@@ -1000,7 +1000,7 @@ static int __init smp_sanity_check(unsigned max_cpus) 
{

	preempt_disable();



#if defined(CONFIG_X86_PC) && defined(CONFIG_X86_32)

#ifndef CONFIG_X86_BIGSMP

	if (def_to_bigsmp && nr_cpu_ids > 8) {

		unsigned int cpu;

		unsigned nr;

drivers/eisa/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#

config EISA_VLB_PRIMING

	bool "Vesa Local Bus priming"

	depends on X86_PC && EISA

	depends on X86 && EISA

	default n

	---help---

	  Activate this option if your system contains a Vesa Local
@@ -24,11 +24,11 @@ config EISA_PCI_EISA 
	  When in doubt, say Y.



# 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

	bool "EISA virtual root device"

	depends on EISA && (ALPHA || X86_PC)

	depends on EISA && (ALPHA || X86)

	default y

	---help---

	  Activate this option if your system only have EISA bus