tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

x86/Voyager: move to the X86_32_NON_STANDARD code section

Make Voyager depend on X86_32_NON_STANDARD - it is a non-standard 32-bit
SMP architecture.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Ingo Molnar 3769e7b4 e0c7ae37

+17 -17
+17 -17
arch/x86/Kconfig
··· 331 331 332 332 If unsure, choose "PC-compatible" instead. 333 333 334 - config X86_VOYAGER 335 - bool "Voyager (NCR)" 336 - depends on X86_32 && SMP && !PCI && BROKEN 337 - depends on X86_NON_STANDARD 338 - help 339 - Voyager is an MCA-based 32-way capable SMP architecture proprietary 340 - to NCR Corp. Machine classes 345x/35xx/4100/51xx are Voyager-based. 341 - 342 - *** WARNING *** 343 - 344 - If you do not specifically know you have a Voyager based machine, 345 - say N here, otherwise the kernel you build will not be bootable. 346 - 347 334 config X86_32_NON_STANDARD 348 335 bool "Support non-standard 32-bit SMP architectures" 349 336 depends on X86_32 && SMP ··· 340 353 subarchitectures. It is intended for a generic binary kernel. 341 354 if you select them all, kernel will probe it one by one. and will 342 355 fallback to default. 356 + 357 + config X86_BIGSMP 358 + bool "Support for big SMP systems with more than 8 CPUs" 359 + depends on X86_32_NON_STANDARD 360 + help 361 + This option is needed for the systems that have more than 8 CPUs 362 + and if the system is not of any sub-arch type above. 343 363 344 364 config X86_NUMAQ 345 365 bool "NUMAQ (IBM/Sequent)" ··· 374 380 Support for Unisys ES7000 systems. Say 'Y' here if this kernel is 375 381 supposed to run on an IA32-based Unisys ES7000 system. 376 382 377 - config X86_BIGSMP 378 - bool "Support for big SMP systems with more than 8 CPUs" 383 + config X86_VOYAGER 384 + bool "Voyager (NCR)" 385 + depends on SMP && !PCI && BROKEN 379 386 depends on X86_32_NON_STANDARD 380 387 help 381 - This option is needed for the systems that have more than 8 CPUs 382 - and if the system is not of any sub-arch type above. 388 + Voyager is an MCA-based 32-way capable SMP architecture proprietary 389 + to NCR Corp. Machine classes 345x/35xx/4100/51xx are Voyager-based. 390 + 391 + *** WARNING *** 392 + 393 + If you do not specifically know you have a Voyager based machine, 394 + say N here, otherwise the kernel you build will not be bootable. 383 395 384 396 config SCHED_OMIT_FRAME_POINTER 385 397 def_bool y