Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 4272ebfbefd0db40073f3ee5990bceaf2894f08b

Authored by Yinghai Lu
Committed by Ingo Molnar
1 parent fbeb2ca022
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Showing 9 changed files with 10 additions and 16 deletions Side-by-side Diff

... ... @@ -262,9 +262,6 @@
262 262 For old smp systems that do not have proper acpi support. Newer systems
263 263 (esp with 64bit cpus) with acpi support, MADT and DSDT will override it
264 264  
265   -config X86_PC
266   - def_bool y
267   -
268 265 config X86_NON_STANDARD
269 266 bool "Support for non-standard x86 platforms"
270 267 help
... ... @@ -1019,7 +1016,6 @@
1019 1016 bool "Numa Memory Allocation and Scheduler Support"
1020 1017 depends on SMP
1021 1018 depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_BIGSMP || X86_SUMMIT && ACPI) && EXPERIMENTAL)
1022   - default n if X86_PC
1023 1019 default y if (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP)
1024 1020 help
1025 1021 Enable NUMA (Non Uniform Memory Access) support.
... ... @@ -1122,7 +1118,7 @@
1122 1118  
1123 1119 config ARCH_SPARSEMEM_ENABLE
1124 1120 def_bool y
1125   - depends on X86_64 || NUMA || (EXPERIMENTAL && X86_PC) || X86_32_NON_STANDARD
  1121 + depends on X86_64 || NUMA || (EXPERIMENTAL && X86_32) || X86_32_NON_STANDARD
1126 1122 select SPARSEMEM_STATIC if X86_32
1127 1123 select SPARSEMEM_VMEMMAP_ENABLE if X86_64
1128 1124  
arch/x86/configs/i386_defconfig
Diff comments   View file @ 4272ebf
... ... @@ -188,7 +188,6 @@
188 188 CONFIG_SMP=y
189 189 CONFIG_X86_FIND_SMP_CONFIG=y
190 190 CONFIG_X86_MPPARSE=y
191   -CONFIG_X86_PC=y
192 191 # CONFIG_X86_ELAN is not set
193 192 # CONFIG_X86_VOYAGER is not set
194 193 # CONFIG_X86_GENERICARCH is not set
arch/x86/configs/x86_64_defconfig
Diff comments   View file @ 4272ebf
... ... @@ -187,7 +187,6 @@
187 187 CONFIG_SMP=y
188 188 CONFIG_X86_FIND_SMP_CONFIG=y
189 189 CONFIG_X86_MPPARSE=y
190   -CONFIG_X86_PC=y
191 190 # CONFIG_X86_ELAN is not set
192 191 # CONFIG_X86_VOYAGER is not set
193 192 # CONFIG_X86_GENERICARCH is not set
arch/x86/kernel/smpboot.c
Diff comments   View file @ 4272ebf
... ... @@ -1000,7 +1000,7 @@
1000 1000 {
1001 1001 preempt_disable();
1002 1002  
1003   -#if defined(CONFIG_X86_PC) && defined(CONFIG_X86_32)
  1003 +#ifndef CONFIG_X86_BIGSMP
1004 1004 if (def_to_bigsmp && nr_cpu_ids > 8) {
1005 1005 unsigned int cpu;
1006 1006 unsigned nr;
drivers/eisa/Kconfig
Diff comments   View file @ 4272ebf
... ... @@ -3,7 +3,7 @@
3 3 #
4 4 config EISA_VLB_PRIMING
5 5 bool "Vesa Local Bus priming"
6   - depends on X86_PC && EISA
  6 + depends on X86 && EISA
7 7 default n
8 8 ---help---
9 9 Activate this option if your system contains a Vesa Local
10 10  
... ... @@ -24,11 +24,11 @@
24 24 When in doubt, say Y.
25 25  
26 26 # Using EISA_VIRTUAL_ROOT on something other than an Alpha or
27   -# an X86_PC may lead to crashes...
  27 +# an X86 may lead to crashes...
28 28  
29 29 config EISA_VIRTUAL_ROOT
30 30 bool "EISA virtual root device"
31   - depends on EISA && (ALPHA || X86_PC)
  31 + depends on EISA && (ALPHA || X86)
32 32 default y
33 33 ---help---
34 34 Activate this option if your system only have EISA bus
drivers/input/keyboard/Kconfig
Diff comments   View file @ 4272ebf
... ... @@ -13,11 +13,11 @@
13 13 if INPUT_KEYBOARD
14 14  
15 15 config KEYBOARD_ATKBD
16   - tristate "AT keyboard" if EMBEDDED || !X86_PC
  16 + tristate "AT keyboard" if EMBEDDED || !X86
17 17 default y
18 18 select SERIO
19 19 select SERIO_LIBPS2
20   - select SERIO_I8042 if X86_PC
  20 + select SERIO_I8042 if X86
21 21 select SERIO_GSCPS2 if GSC
22 22 help
23 23 Say Y here if you want to use a standard AT or PS/2 keyboard. Usually
drivers/input/mouse/Kconfig
Diff comments   View file @ 4272ebf
... ... @@ -17,7 +17,7 @@
17 17 default y
18 18 select SERIO
19 19 select SERIO_LIBPS2
20   - select SERIO_I8042 if X86_PC
  20 + select SERIO_I8042 if X86
21 21 select SERIO_GSCPS2 if GSC
22 22 help
23 23 Say Y here if you have a PS/2 mouse connected to your system. This
drivers/mtd/nand/Kconfig
Diff comments   View file @ 4272ebf
... ... @@ -273,7 +273,7 @@
273 273  
274 274 config MTD_NAND_CS553X
275 275 tristate "NAND support for CS5535/CS5536 (AMD Geode companion chip)"
276   - depends on X86_32 && (X86_PC || X86_32_NON_STANDARD)
  276 + depends on X86_32
277 277 help
278 278 The CS553x companion chips for the AMD Geode processor
279 279 include NAND flash controllers with built-in hardware ECC
sound/drivers/Kconfig
Diff comments   View file @ 4272ebf
... ... @@ -33,7 +33,7 @@
33 33  
34 34 config SND_PCSP
35 35 tristate "PC-Speaker support (READ HELP!)"
36   - depends on PCSPKR_PLATFORM && X86_PC && HIGH_RES_TIMERS
  36 + depends on PCSPKR_PLATFORM && X86 && HIGH_RES_TIMERS
37 37 depends on INPUT
38 38 depends on EXPERIMENTAL
39 39 select SND_PCM