diff options
author | Kees Cook <keescook@chromium.org> | 2013-01-16 21:53:19 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-21 17:43:12 -0500 |
commit | 7d60717eab8b3b7b987774fdb56aa9f938b83bd5 (patch) | |
tree | c8eecdd2473d227293d4f9406a852a423c981d8c | |
parent | 8d2f5f0e571e85d5fc171b5512c59e8587f5077d (diff) |
arch/mips: remove depends on CONFIG_EXPERIMENTAL
The CONFIG_EXPERIMENTAL config item has not carried much meaning for a
while now and is almost always enabled by default. As agreed during the
Linux kernel summit, remove it from any "depends on" lines in Kconfigs.
CC: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | arch/mips/Kconfig | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 2ac626ab9d43..e96cf7a06d9f 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -170,7 +170,7 @@ config MACH_DECSTATION | |||
170 | select SYS_HAS_CPU_R3000 | 170 | select SYS_HAS_CPU_R3000 |
171 | select SYS_HAS_CPU_R4X00 | 171 | select SYS_HAS_CPU_R4X00 |
172 | select SYS_SUPPORTS_32BIT_KERNEL | 172 | select SYS_SUPPORTS_32BIT_KERNEL |
173 | select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL | 173 | select SYS_SUPPORTS_64BIT_KERNEL |
174 | select SYS_SUPPORTS_LITTLE_ENDIAN | 174 | select SYS_SUPPORTS_LITTLE_ENDIAN |
175 | select SYS_SUPPORTS_128HZ | 175 | select SYS_SUPPORTS_128HZ |
176 | select SYS_SUPPORTS_256HZ | 176 | select SYS_SUPPORTS_256HZ |
@@ -206,7 +206,7 @@ config MACH_JAZZ | |||
206 | select ISA | 206 | select ISA |
207 | select SYS_HAS_CPU_R4X00 | 207 | select SYS_HAS_CPU_R4X00 |
208 | select SYS_SUPPORTS_32BIT_KERNEL | 208 | select SYS_SUPPORTS_32BIT_KERNEL |
209 | select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL | 209 | select SYS_SUPPORTS_64BIT_KERNEL |
210 | select SYS_SUPPORTS_100HZ | 210 | select SYS_SUPPORTS_100HZ |
211 | help | 211 | help |
212 | This a family of machines based on the MIPS R4030 chipset which was | 212 | This a family of machines based on the MIPS R4030 chipset which was |
@@ -396,7 +396,6 @@ config PNX8550_STB810 | |||
396 | 396 | ||
397 | config PMC_MSP | 397 | config PMC_MSP |
398 | bool "PMC-Sierra MSP chipsets" | 398 | bool "PMC-Sierra MSP chipsets" |
399 | depends on EXPERIMENTAL | ||
400 | select CEVT_R4K | 399 | select CEVT_R4K |
401 | select CSRC_R4K | 400 | select CSRC_R4K |
402 | select DMA_NONCOHERENT | 401 | select DMA_NONCOHERENT |
@@ -495,8 +494,7 @@ config SGI_IP27 | |||
495 | here. | 494 | here. |
496 | 495 | ||
497 | config SGI_IP28 | 496 | config SGI_IP28 |
498 | bool "SGI IP28 (Indigo2 R10k) (EXPERIMENTAL)" | 497 | bool "SGI IP28 (Indigo2 R10k)" |
499 | depends on EXPERIMENTAL | ||
500 | select FW_ARC | 498 | select FW_ARC |
501 | select FW_ARC64 | 499 | select FW_ARC64 |
502 | select BOOT_ELF64 | 500 | select BOOT_ELF64 |
@@ -554,7 +552,6 @@ config SGI_IP32 | |||
554 | 552 | ||
555 | config SIBYTE_CRHINE | 553 | config SIBYTE_CRHINE |
556 | bool "Sibyte BCM91120C-CRhine" | 554 | bool "Sibyte BCM91120C-CRhine" |
557 | depends on EXPERIMENTAL | ||
558 | select BOOT_ELF32 | 555 | select BOOT_ELF32 |
559 | select DMA_COHERENT | 556 | select DMA_COHERENT |
560 | select SIBYTE_BCM1120 | 557 | select SIBYTE_BCM1120 |
@@ -565,7 +562,6 @@ config SIBYTE_CRHINE | |||
565 | 562 | ||
566 | config SIBYTE_CARMEL | 563 | config SIBYTE_CARMEL |
567 | bool "Sibyte BCM91120x-Carmel" | 564 | bool "Sibyte BCM91120x-Carmel" |
568 | depends on EXPERIMENTAL | ||
569 | select BOOT_ELF32 | 565 | select BOOT_ELF32 |
570 | select DMA_COHERENT | 566 | select DMA_COHERENT |
571 | select SIBYTE_BCM1120 | 567 | select SIBYTE_BCM1120 |
@@ -576,7 +572,6 @@ config SIBYTE_CARMEL | |||
576 | 572 | ||
577 | config SIBYTE_CRHONE | 573 | config SIBYTE_CRHONE |
578 | bool "Sibyte BCM91125C-CRhone" | 574 | bool "Sibyte BCM91125C-CRhone" |
579 | depends on EXPERIMENTAL | ||
580 | select BOOT_ELF32 | 575 | select BOOT_ELF32 |
581 | select DMA_COHERENT | 576 | select DMA_COHERENT |
582 | select SIBYTE_BCM1125 | 577 | select SIBYTE_BCM1125 |
@@ -588,7 +583,6 @@ config SIBYTE_CRHONE | |||
588 | 583 | ||
589 | config SIBYTE_RHONE | 584 | config SIBYTE_RHONE |
590 | bool "Sibyte BCM91125E-Rhone" | 585 | bool "Sibyte BCM91125E-Rhone" |
591 | depends on EXPERIMENTAL | ||
592 | select BOOT_ELF32 | 586 | select BOOT_ELF32 |
593 | select DMA_COHERENT | 587 | select DMA_COHERENT |
594 | select SIBYTE_BCM1125H | 588 | select SIBYTE_BCM1125H |
@@ -613,7 +607,6 @@ config SIBYTE_SWARM | |||
613 | 607 | ||
614 | config SIBYTE_LITTLESUR | 608 | config SIBYTE_LITTLESUR |
615 | bool "Sibyte BCM91250C2-LittleSur" | 609 | bool "Sibyte BCM91250C2-LittleSur" |
616 | depends on EXPERIMENTAL | ||
617 | select BOOT_ELF32 | 610 | select BOOT_ELF32 |
618 | select DMA_COHERENT | 611 | select DMA_COHERENT |
619 | select HAVE_PATA_PLATFORM | 612 | select HAVE_PATA_PLATFORM |
@@ -627,7 +620,6 @@ config SIBYTE_LITTLESUR | |||
627 | 620 | ||
628 | config SIBYTE_SENTOSA | 621 | config SIBYTE_SENTOSA |
629 | bool "Sibyte BCM91250E-Sentosa" | 622 | bool "Sibyte BCM91250E-Sentosa" |
630 | depends on EXPERIMENTAL | ||
631 | select BOOT_ELF32 | 623 | select BOOT_ELF32 |
632 | select DMA_COHERENT | 624 | select DMA_COHERENT |
633 | select NR_CPUS_DEFAULT_2 | 625 | select NR_CPUS_DEFAULT_2 |
@@ -676,7 +668,7 @@ config SNI_RM | |||
676 | select R5000_CPU_SCACHE | 668 | select R5000_CPU_SCACHE |
677 | select SYS_HAS_EARLY_PRINTK | 669 | select SYS_HAS_EARLY_PRINTK |
678 | select SYS_SUPPORTS_32BIT_KERNEL | 670 | select SYS_SUPPORTS_32BIT_KERNEL |
679 | select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL | 671 | select SYS_SUPPORTS_64BIT_KERNEL |
680 | select SYS_SUPPORTS_BIG_ENDIAN | 672 | select SYS_SUPPORTS_BIG_ENDIAN |
681 | select SYS_SUPPORTS_HIGHMEM | 673 | select SYS_SUPPORTS_HIGHMEM |
682 | select SYS_SUPPORTS_LITTLE_ENDIAN | 674 | select SYS_SUPPORTS_LITTLE_ENDIAN |
@@ -780,7 +772,6 @@ config CAVIUM_OCTEON_REFERENCE_BOARD | |||
780 | 772 | ||
781 | config NLM_XLR_BOARD | 773 | config NLM_XLR_BOARD |
782 | bool "Netlogic XLR/XLS based systems" | 774 | bool "Netlogic XLR/XLS based systems" |
783 | depends on EXPERIMENTAL | ||
784 | select BOOT_ELF32 | 775 | select BOOT_ELF32 |
785 | select NLM_COMMON | 776 | select NLM_COMMON |
786 | select SYS_HAS_CPU_XLR | 777 | select SYS_HAS_CPU_XLR |
@@ -809,7 +800,6 @@ config NLM_XLR_BOARD | |||
809 | 800 | ||
810 | config NLM_XLP_BOARD | 801 | config NLM_XLP_BOARD |
811 | bool "Netlogic XLP based systems" | 802 | bool "Netlogic XLP based systems" |
812 | depends on EXPERIMENTAL | ||
813 | select BOOT_ELF32 | 803 | select BOOT_ELF32 |
814 | select NLM_COMMON | 804 | select NLM_COMMON |
815 | select SYS_HAS_CPU_XLP | 805 | select SYS_HAS_CPU_XLP |
@@ -1375,7 +1365,6 @@ config CPU_R5500 | |||
1375 | 1365 | ||
1376 | config CPU_R6000 | 1366 | config CPU_R6000 |
1377 | bool "R6000" | 1367 | bool "R6000" |
1378 | depends on EXPERIMENTAL | ||
1379 | depends on SYS_HAS_CPU_R6000 | 1368 | depends on SYS_HAS_CPU_R6000 |
1380 | select CPU_SUPPORTS_32BIT_KERNEL | 1369 | select CPU_SUPPORTS_32BIT_KERNEL |
1381 | help | 1370 | help |
@@ -1393,7 +1382,6 @@ config CPU_NEVADA | |||
1393 | 1382 | ||
1394 | config CPU_R8000 | 1383 | config CPU_R8000 |
1395 | bool "R8000" | 1384 | bool "R8000" |
1396 | depends on EXPERIMENTAL | ||
1397 | depends on SYS_HAS_CPU_R8000 | 1385 | depends on SYS_HAS_CPU_R8000 |
1398 | select CPU_HAS_PREFETCH | 1386 | select CPU_HAS_PREFETCH |
1399 | select CPU_SUPPORTS_64BIT_KERNEL | 1387 | select CPU_SUPPORTS_64BIT_KERNEL |
@@ -1768,7 +1756,7 @@ config PAGE_SIZE_4KB | |||
1768 | 1756 | ||
1769 | config PAGE_SIZE_8KB | 1757 | config PAGE_SIZE_8KB |
1770 | bool "8kB" | 1758 | bool "8kB" |
1771 | depends on (EXPERIMENTAL && CPU_R8000) || CPU_CAVIUM_OCTEON | 1759 | depends on CPU_R8000 || CPU_CAVIUM_OCTEON |
1772 | help | 1760 | help |
1773 | Using 8kB page size will result in higher performance kernel at | 1761 | Using 8kB page size will result in higher performance kernel at |
1774 | the price of higher memory consumption. This option is available | 1762 | the price of higher memory consumption. This option is available |
@@ -1795,7 +1783,7 @@ config PAGE_SIZE_32KB | |||
1795 | 1783 | ||
1796 | config PAGE_SIZE_64KB | 1784 | config PAGE_SIZE_64KB |
1797 | bool "64kB" | 1785 | bool "64kB" |
1798 | depends on EXPERIMENTAL && !CPU_R3000 && !CPU_TX39XX | 1786 | depends on !CPU_R3000 && !CPU_TX39XX |
1799 | help | 1787 | help |
1800 | Using 64kB page size will result in higher performance kernel at | 1788 | Using 64kB page size will result in higher performance kernel at |
1801 | the price of higher memory consumption. This option is available on | 1789 | the price of higher memory consumption. This option is available on |
@@ -2312,8 +2300,7 @@ config HZ | |||
2312 | source "kernel/Kconfig.preempt" | 2300 | source "kernel/Kconfig.preempt" |
2313 | 2301 | ||
2314 | config KEXEC | 2302 | config KEXEC |
2315 | bool "Kexec system call (EXPERIMENTAL)" | 2303 | bool "Kexec system call" |
2316 | depends on EXPERIMENTAL | ||
2317 | help | 2304 | help |
2318 | kexec is a system call that implements the ability to shutdown your | 2305 | kexec is a system call that implements the ability to shutdown your |
2319 | current kernel, and to start another kernel. It is like a reboot | 2306 | current kernel, and to start another kernel. It is like a reboot |