diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 15:05:51 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 15:05:51 -0500 |
commit | 06991c28f37ad68e5c03777f5c3b679b56e3dac1 (patch) | |
tree | 4be75788e21c3c644fe6d39abf47693a171cf4f8 /arch | |
parent | 460dc1eecf37263c8e3b17685ef236f0d236facb (diff) | |
parent | 74fef7a8fd1d2bd94f925d6638bb4c3049e7c381 (diff) |
Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core patches from Greg Kroah-Hartman:
"Here is the big driver core merge for 3.9-rc1
There are two major series here, both of which touch lots of drivers
all over the kernel, and will cause you some merge conflicts:
- add a new function called devm_ioremap_resource() to properly be
able to check return values.
- remove CONFIG_EXPERIMENTAL
Other than those patches, there's not much here, some minor fixes and
updates"
Fix up trivial conflicts
* tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (221 commits)
base: memory: fix soft/hard_offline_page permissions
drivercore: Fix ordering between deferred_probe and exiting initcalls
backlight: fix class_find_device() arguments
TTY: mark tty_get_device call with the proper const values
driver-core: constify data for class_find_device()
firmware: Ignore abort check when no user-helper is used
firmware: Reduce ifdef CONFIG_FW_LOADER_USER_HELPER
firmware: Make user-mode helper optional
firmware: Refactoring for splitting user-mode helper code
Driver core: treat unregistered bus_types as having no devices
watchdog: Convert to devm_ioremap_resource()
thermal: Convert to devm_ioremap_resource()
spi: Convert to devm_ioremap_resource()
power: Convert to devm_ioremap_resource()
mtd: Convert to devm_ioremap_resource()
mmc: Convert to devm_ioremap_resource()
mfd: Convert to devm_ioremap_resource()
media: Convert to devm_ioremap_resource()
iommu: Convert to devm_ioremap_resource()
drm: Convert to devm_ioremap_resource()
...
Diffstat (limited to 'arch')
36 files changed, 104 insertions, 139 deletions
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig index 9b504af2e966..775361f67bfd 100644 --- a/arch/alpha/Kconfig +++ b/arch/alpha/Kconfig | |||
@@ -555,8 +555,7 @@ config NR_CPUS | |||
555 | with working support have a maximum of 4 CPUs. | 555 | with working support have a maximum of 4 CPUs. |
556 | 556 | ||
557 | config ARCH_DISCONTIGMEM_ENABLE | 557 | config ARCH_DISCONTIGMEM_ENABLE |
558 | bool "Discontiguous Memory Support (EXPERIMENTAL)" | 558 | bool "Discontiguous Memory Support" |
559 | depends on EXPERIMENTAL | ||
560 | help | 559 | help |
561 | Say Y to support efficient handling of discontiguous physical memory, | 560 | Say Y to support efficient handling of discontiguous physical memory, |
562 | for architectures which are either NUMA (Non-Uniform Memory Access) | 561 | for architectures which are either NUMA (Non-Uniform Memory Access) |
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 2f66b2e42490..f410cb16dd22 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -1530,7 +1530,6 @@ config SMP | |||
1530 | 1530 | ||
1531 | config SMP_ON_UP | 1531 | config SMP_ON_UP |
1532 | bool "Allow booting SMP kernel on uniprocessor systems (EXPERIMENTAL)" | 1532 | bool "Allow booting SMP kernel on uniprocessor systems (EXPERIMENTAL)" |
1533 | depends on EXPERIMENTAL | ||
1534 | depends on SMP && !XIP_KERNEL | 1533 | depends on SMP && !XIP_KERNEL |
1535 | default y | 1534 | default y |
1536 | help | 1535 | help |
@@ -1731,7 +1730,7 @@ config AEABI | |||
1731 | 1730 | ||
1732 | config OABI_COMPAT | 1731 | config OABI_COMPAT |
1733 | bool "Allow old ABI binaries to run with this kernel (EXPERIMENTAL)" | 1732 | bool "Allow old ABI binaries to run with this kernel (EXPERIMENTAL)" |
1734 | depends on AEABI && EXPERIMENTAL && !THUMB2_KERNEL | 1733 | depends on AEABI && !THUMB2_KERNEL |
1735 | default y | 1734 | default y |
1736 | help | 1735 | help |
1737 | This option preserves the old syscall interface along with the | 1736 | This option preserves the old syscall interface along with the |
@@ -1855,7 +1854,6 @@ config SECCOMP | |||
1855 | 1854 | ||
1856 | config CC_STACKPROTECTOR | 1855 | config CC_STACKPROTECTOR |
1857 | bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)" | 1856 | bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)" |
1858 | depends on EXPERIMENTAL | ||
1859 | help | 1857 | help |
1860 | This option turns on the -fstack-protector GCC feature. This | 1858 | This option turns on the -fstack-protector GCC feature. This |
1861 | feature puts, at the beginning of functions, a canary value on | 1859 | feature puts, at the beginning of functions, a canary value on |
@@ -1872,7 +1870,7 @@ config XEN_DOM0 | |||
1872 | 1870 | ||
1873 | config XEN | 1871 | config XEN |
1874 | bool "Xen guest support on ARM (EXPERIMENTAL)" | 1872 | bool "Xen guest support on ARM (EXPERIMENTAL)" |
1875 | depends on EXPERIMENTAL && ARM && OF | 1873 | depends on ARM && OF |
1876 | depends on CPU_V7 && !CPU_V6 | 1874 | depends on CPU_V7 && !CPU_V6 |
1877 | help | 1875 | help |
1878 | Say Y if you want to run Linux in a Virtual Machine on Xen on ARM. | 1876 | Say Y if you want to run Linux in a Virtual Machine on Xen on ARM. |
@@ -1941,7 +1939,7 @@ config ZBOOT_ROM | |||
1941 | 1939 | ||
1942 | choice | 1940 | choice |
1943 | prompt "Include SD/MMC loader in zImage (EXPERIMENTAL)" | 1941 | prompt "Include SD/MMC loader in zImage (EXPERIMENTAL)" |
1944 | depends on ZBOOT_ROM && ARCH_SH7372 && EXPERIMENTAL | 1942 | depends on ZBOOT_ROM && ARCH_SH7372 |
1945 | default ZBOOT_ROM_NONE | 1943 | default ZBOOT_ROM_NONE |
1946 | help | 1944 | help |
1947 | Include experimental SD/MMC loading code in the ROM-able zImage. | 1945 | Include experimental SD/MMC loading code in the ROM-able zImage. |
@@ -1970,7 +1968,7 @@ endchoice | |||
1970 | 1968 | ||
1971 | config ARM_APPENDED_DTB | 1969 | config ARM_APPENDED_DTB |
1972 | bool "Use appended device tree blob to zImage (EXPERIMENTAL)" | 1970 | bool "Use appended device tree blob to zImage (EXPERIMENTAL)" |
1973 | depends on OF && !ZBOOT_ROM && EXPERIMENTAL | 1971 | depends on OF && !ZBOOT_ROM |
1974 | help | 1972 | help |
1975 | With this option, the boot code will look for a device tree binary | 1973 | With this option, the boot code will look for a device tree binary |
1976 | (DTB) appended to zImage | 1974 | (DTB) appended to zImage |
@@ -2088,7 +2086,7 @@ config XIP_PHYS_ADDR | |||
2088 | 2086 | ||
2089 | config KEXEC | 2087 | config KEXEC |
2090 | bool "Kexec system call (EXPERIMENTAL)" | 2088 | bool "Kexec system call (EXPERIMENTAL)" |
2091 | depends on EXPERIMENTAL && (!SMP || HOTPLUG_CPU) | 2089 | depends on (!SMP || HOTPLUG_CPU) |
2092 | help | 2090 | help |
2093 | kexec is a system call that implements the ability to shutdown your | 2091 | kexec is a system call that implements the ability to shutdown your |
2094 | current kernel, and to start another kernel. It is like a reboot | 2092 | current kernel, and to start another kernel. It is like a reboot |
@@ -2110,7 +2108,6 @@ config ATAGS_PROC | |||
2110 | 2108 | ||
2111 | config CRASH_DUMP | 2109 | config CRASH_DUMP |
2112 | bool "Build kdump crash kernel (EXPERIMENTAL)" | 2110 | bool "Build kdump crash kernel (EXPERIMENTAL)" |
2113 | depends on EXPERIMENTAL | ||
2114 | help | 2111 | help |
2115 | Generate crash dump after being started by kexec. This should | 2112 | Generate crash dump after being started by kexec. This should |
2116 | be normally only set in special crash dump kernels which are | 2113 | be normally only set in special crash dump kernels which are |
@@ -2177,7 +2174,7 @@ config CPU_FREQ_S3C | |||
2177 | 2174 | ||
2178 | config CPU_FREQ_S3C24XX | 2175 | config CPU_FREQ_S3C24XX |
2179 | bool "CPUfreq driver for Samsung S3C24XX series CPUs (EXPERIMENTAL)" | 2176 | bool "CPUfreq driver for Samsung S3C24XX series CPUs (EXPERIMENTAL)" |
2180 | depends on ARCH_S3C24XX && CPU_FREQ && EXPERIMENTAL | 2177 | depends on ARCH_S3C24XX && CPU_FREQ |
2181 | select CPU_FREQ_S3C | 2178 | select CPU_FREQ_S3C |
2182 | help | 2179 | help |
2183 | This enables the CPUfreq driver for the Samsung S3C24XX family | 2180 | This enables the CPUfreq driver for the Samsung S3C24XX family |
@@ -2189,7 +2186,7 @@ config CPU_FREQ_S3C24XX | |||
2189 | 2186 | ||
2190 | config CPU_FREQ_S3C24XX_PLL | 2187 | config CPU_FREQ_S3C24XX_PLL |
2191 | bool "Support CPUfreq changing of PLL frequency (EXPERIMENTAL)" | 2188 | bool "Support CPUfreq changing of PLL frequency (EXPERIMENTAL)" |
2192 | depends on CPU_FREQ_S3C24XX && EXPERIMENTAL | 2189 | depends on CPU_FREQ_S3C24XX |
2193 | help | 2190 | help |
2194 | Compile in support for changing the PLL frequency from the | 2191 | Compile in support for changing the PLL frequency from the |
2195 | S3C24XX series CPUfreq driver. The PLL takes time to settle | 2192 | S3C24XX series CPUfreq driver. The PLL takes time to settle |
@@ -2252,7 +2249,7 @@ config FPE_NWFPE_XP | |||
2252 | 2249 | ||
2253 | config FPE_FASTFPE | 2250 | config FPE_FASTFPE |
2254 | bool "FastFPE math emulation (EXPERIMENTAL)" | 2251 | bool "FastFPE math emulation (EXPERIMENTAL)" |
2255 | depends on (!AEABI || OABI_COMPAT) && !CPU_32v3 && EXPERIMENTAL | 2252 | depends on (!AEABI || OABI_COMPAT) && !CPU_32v3 |
2256 | ---help--- | 2253 | ---help--- |
2257 | Say Y here to include the FAST floating point emulator in the kernel. | 2254 | Say Y here to include the FAST floating point emulator in the kernel. |
2258 | This is an experimental much faster emulator which now also has full | 2255 | This is an experimental much faster emulator which now also has full |
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 661030d6bc6c..fc2a591e1676 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug | |||
@@ -32,7 +32,7 @@ config FRAME_POINTER | |||
32 | 32 | ||
33 | config ARM_UNWIND | 33 | config ARM_UNWIND |
34 | bool "Enable stack unwinding support (EXPERIMENTAL)" | 34 | bool "Enable stack unwinding support (EXPERIMENTAL)" |
35 | depends on AEABI && EXPERIMENTAL | 35 | depends on AEABI |
36 | default y | 36 | default y |
37 | help | 37 | help |
38 | This option enables stack unwinding support in the kernel | 38 | This option enables stack unwinding support in the kernel |
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index 8033cb747c86..64bac53da0e8 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c | |||
@@ -1134,11 +1134,9 @@ static int gpmc_probe(struct platform_device *pdev) | |||
1134 | phys_base = res->start; | 1134 | phys_base = res->start; |
1135 | mem_size = resource_size(res); | 1135 | mem_size = resource_size(res); |
1136 | 1136 | ||
1137 | gpmc_base = devm_request_and_ioremap(&pdev->dev, res); | 1137 | gpmc_base = devm_ioremap_resource(&pdev->dev, res); |
1138 | if (!gpmc_base) { | 1138 | if (IS_ERR(gpmc_base)) |
1139 | dev_err(&pdev->dev, "error: request memory / ioremap\n"); | 1139 | return PTR_ERR(gpmc_base); |
1140 | return -EADDRNOTAVAIL; | ||
1141 | } | ||
1142 | 1140 | ||
1143 | res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); | 1141 | res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); |
1144 | if (res == NULL) | 1142 | if (res == NULL) |
diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig index 25df14a9e268..3445c4f42347 100644 --- a/arch/arm/mach-s3c24xx/Kconfig +++ b/arch/arm/mach-s3c24xx/Kconfig | |||
@@ -291,8 +291,8 @@ config MACH_JIVE | |||
291 | Say Y here if you are using the Logitech Jive. | 291 | Say Y here if you are using the Logitech Jive. |
292 | 292 | ||
293 | config MACH_JIVE_SHOW_BOOTLOADER | 293 | config MACH_JIVE_SHOW_BOOTLOADER |
294 | bool "Allow access to bootloader partitions in MTD (EXPERIMENTAL)" | 294 | bool "Allow access to bootloader partitions in MTD" |
295 | depends on MACH_JIVE && EXPERIMENTAL | 295 | depends on MACH_JIVE |
296 | 296 | ||
297 | config MACH_S3C2413 | 297 | config MACH_S3C2413 |
298 | bool | 298 | bool |
diff --git a/arch/arm/mach-tegra/tegra2_emc.c b/arch/arm/mach-tegra/tegra2_emc.c index e18aa2f83ebf..ce7ce42a1ac9 100644 --- a/arch/arm/mach-tegra/tegra2_emc.c +++ b/arch/arm/mach-tegra/tegra2_emc.c | |||
@@ -312,11 +312,9 @@ static int tegra_emc_probe(struct platform_device *pdev) | |||
312 | return -ENOMEM; | 312 | return -ENOMEM; |
313 | } | 313 | } |
314 | 314 | ||
315 | emc_regbase = devm_request_and_ioremap(&pdev->dev, res); | 315 | emc_regbase = devm_ioremap_resource(&pdev->dev, res); |
316 | if (!emc_regbase) { | 316 | if (IS_ERR(emc_regbase)) |
317 | dev_err(&pdev->dev, "failed to remap registers\n"); | 317 | return PTR_ERR(emc_regbase); |
318 | return -ENOMEM; | ||
319 | } | ||
320 | 318 | ||
321 | pdata = pdev->dev.platform_data; | 319 | pdata = pdev->dev.platform_data; |
322 | 320 | ||
diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c index 7b433f3bddca..a0daa2fb5de6 100644 --- a/arch/arm/plat-omap/dmtimer.c +++ b/arch/arm/plat-omap/dmtimer.c | |||
@@ -808,11 +808,9 @@ static int omap_dm_timer_probe(struct platform_device *pdev) | |||
808 | return -ENOMEM; | 808 | return -ENOMEM; |
809 | } | 809 | } |
810 | 810 | ||
811 | timer->io_base = devm_request_and_ioremap(dev, mem); | 811 | timer->io_base = devm_ioremap_resource(dev, mem); |
812 | if (!timer->io_base) { | 812 | if (IS_ERR(timer->io_base)) |
813 | dev_err(dev, "%s: region already claimed.\n", __func__); | 813 | return PTR_ERR(timer->io_base); |
814 | return -ENOMEM; | ||
815 | } | ||
816 | 814 | ||
817 | if (dev->of_node) { | 815 | if (dev->of_node) { |
818 | if (of_find_property(dev->of_node, "ti,timer-alwon", NULL)) | 816 | if (of_find_property(dev->of_node, "ti,timer-alwon", NULL)) |
diff --git a/arch/arm/plat-samsung/adc.c b/arch/arm/plat-samsung/adc.c index 2d676ab50f73..ca07cb1b155a 100644 --- a/arch/arm/plat-samsung/adc.c +++ b/arch/arm/plat-samsung/adc.c | |||
@@ -386,11 +386,9 @@ static int s3c_adc_probe(struct platform_device *pdev) | |||
386 | return -ENXIO; | 386 | return -ENXIO; |
387 | } | 387 | } |
388 | 388 | ||
389 | adc->regs = devm_request_and_ioremap(dev, regs); | 389 | adc->regs = devm_ioremap_resource(dev, regs); |
390 | if (!adc->regs) { | 390 | if (IS_ERR(adc->regs)) |
391 | dev_err(dev, "failed to map registers\n"); | 391 | return PTR_ERR(adc->regs); |
392 | return -ENXIO; | ||
393 | } | ||
394 | 392 | ||
395 | ret = regulator_enable(adc->vdd); | 393 | ret = regulator_enable(adc->vdd); |
396 | if (ret) | 394 | if (ret) |
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index 67e4aaad78f5..e98f3248c8aa 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig | |||
@@ -560,8 +560,7 @@ choice | |||
560 | accurate - This option is therefore marked experimental. | 560 | accurate - This option is therefore marked experimental. |
561 | 561 | ||
562 | config BFIN_KERNEL_CLOCK_MEMINIT_CALC | 562 | config BFIN_KERNEL_CLOCK_MEMINIT_CALC |
563 | bool "Calculate Timings (EXPERIMENTAL)" | 563 | bool "Calculate Timings" |
564 | depends on EXPERIMENTAL | ||
565 | 564 | ||
566 | config BFIN_KERNEL_CLOCK_MEMINIT_SPEC | 565 | config BFIN_KERNEL_CLOCK_MEMINIT_SPEC |
567 | bool "Provide accurate Timings based on target SCLK" | 566 | bool "Provide accurate Timings based on target SCLK" |
@@ -1118,7 +1117,7 @@ endchoice | |||
1118 | 1117 | ||
1119 | comment "Memory Protection Unit" | 1118 | comment "Memory Protection Unit" |
1120 | config MPU | 1119 | config MPU |
1121 | bool "Enable the memory protection unit (EXPERIMENTAL)" | 1120 | bool "Enable the memory protection unit" |
1122 | default n | 1121 | default n |
1123 | help | 1122 | help |
1124 | Use the processor's MPU to protect applications from accessing | 1123 | Use the processor's MPU to protect applications from accessing |
@@ -1440,7 +1439,6 @@ config BFIN_CPU_FREQ | |||
1440 | 1439 | ||
1441 | config CPU_VOLTAGE | 1440 | config CPU_VOLTAGE |
1442 | bool "CPU Voltage scaling" | 1441 | bool "CPU Voltage scaling" |
1443 | depends on EXPERIMENTAL | ||
1444 | depends on CPU_FREQ | 1442 | depends on CPU_FREQ |
1445 | default n | 1443 | default n |
1446 | help | 1444 | help |
diff --git a/arch/cris/arch-v32/drivers/Kconfig b/arch/cris/arch-v32/drivers/Kconfig index de43aadcdbc4..af4a486dadcd 100644 --- a/arch/cris/arch-v32/drivers/Kconfig +++ b/arch/cris/arch-v32/drivers/Kconfig | |||
@@ -680,7 +680,7 @@ config ETRAX_SPI_MMC_BOARD | |||
680 | 680 | ||
681 | config SPI_ETRAX_SSER | 681 | config SPI_ETRAX_SSER |
682 | tristate | 682 | tristate |
683 | depends on SPI_MASTER && ETRAX_ARCH_V32 && EXPERIMENTAL | 683 | depends on SPI_MASTER && ETRAX_ARCH_V32 |
684 | select SPI_BITBANG | 684 | select SPI_BITBANG |
685 | help | 685 | help |
686 | This enables using an synchronous serial (sser) port as a | 686 | This enables using an synchronous serial (sser) port as a |
@@ -689,7 +689,7 @@ config SPI_ETRAX_SSER | |||
689 | 689 | ||
690 | config SPI_ETRAX_GPIO | 690 | config SPI_ETRAX_GPIO |
691 | tristate | 691 | tristate |
692 | depends on SPI_MASTER && ETRAX_ARCH_V32 && EXPERIMENTAL | 692 | depends on SPI_MASTER && ETRAX_ARCH_V32 |
693 | select SPI_BITBANG | 693 | select SPI_BITBANG |
694 | help | 694 | help |
695 | This enables using GPIO pins port as a SPI master controller | 695 | This enables using GPIO pins port as a SPI master controller |
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 00c2e88f7755..c1b80fb6938d 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
@@ -374,8 +374,8 @@ config NR_CPUS | |||
374 | performance hit. | 374 | performance hit. |
375 | 375 | ||
376 | config HOTPLUG_CPU | 376 | config HOTPLUG_CPU |
377 | bool "Support for hot-pluggable CPUs (EXPERIMENTAL)" | 377 | bool "Support for hot-pluggable CPUs" |
378 | depends on SMP && EXPERIMENTAL | 378 | depends on SMP |
379 | select HOTPLUG | 379 | select HOTPLUG |
380 | default n | 380 | default n |
381 | ---help--- | 381 | ---help--- |
@@ -554,8 +554,8 @@ config IA64_HP_AML_NFW | |||
554 | source "drivers/sn/Kconfig" | 554 | source "drivers/sn/Kconfig" |
555 | 555 | ||
556 | config KEXEC | 556 | config KEXEC |
557 | bool "kexec system call (EXPERIMENTAL)" | 557 | bool "kexec system call" |
558 | depends on EXPERIMENTAL && !IA64_HP_SIM && (!SMP || HOTPLUG_CPU) | 558 | depends on !IA64_HP_SIM && (!SMP || HOTPLUG_CPU) |
559 | help | 559 | help |
560 | kexec is a system call that implements the ability to shutdown your | 560 | kexec is a system call that implements the ability to shutdown your |
561 | current kernel, and to start another kernel. It is like a reboot | 561 | current kernel, and to start another kernel. It is like a reboot |
diff --git a/arch/ia64/kvm/Kconfig b/arch/ia64/kvm/Kconfig index e7947528aee6..2cd225f8c68d 100644 --- a/arch/ia64/kvm/Kconfig +++ b/arch/ia64/kvm/Kconfig | |||
@@ -20,7 +20,7 @@ if VIRTUALIZATION | |||
20 | config KVM | 20 | config KVM |
21 | tristate "Kernel-based Virtual Machine (KVM) support" | 21 | tristate "Kernel-based Virtual Machine (KVM) support" |
22 | depends on BROKEN | 22 | depends on BROKEN |
23 | depends on HAVE_KVM && MODULES && EXPERIMENTAL | 23 | depends on HAVE_KVM && MODULES |
24 | # for device assignment: | 24 | # for device assignment: |
25 | depends on PCI | 25 | depends on PCI |
26 | depends on BROKEN | 26 | depends on BROKEN |
diff --git a/arch/ia64/xen/Kconfig b/arch/ia64/xen/Kconfig index 515e0826803a..5d8a06b0ddf7 100644 --- a/arch/ia64/xen/Kconfig +++ b/arch/ia64/xen/Kconfig | |||
@@ -5,7 +5,7 @@ | |||
5 | config XEN | 5 | config XEN |
6 | bool "Xen hypervisor support" | 6 | bool "Xen hypervisor support" |
7 | default y | 7 | default y |
8 | depends on PARAVIRT && MCKINLEY && IA64_PAGE_SIZE_16KB && EXPERIMENTAL | 8 | depends on PARAVIRT && MCKINLEY && IA64_PAGE_SIZE_16KB |
9 | select XEN_XENCOMM | 9 | select XEN_XENCOMM |
10 | select NO_IDLE_HZ | 10 | select NO_IDLE_HZ |
11 | # followings are required to save/restore. | 11 | # followings are required to save/restore. |
diff --git a/arch/microblaze/platform/Kconfig.platform b/arch/microblaze/platform/Kconfig.platform index 669c7eec293e..b1747211b8b1 100644 --- a/arch/microblaze/platform/Kconfig.platform +++ b/arch/microblaze/platform/Kconfig.platform | |||
@@ -20,7 +20,7 @@ endchoice | |||
20 | 20 | ||
21 | config SELFMOD | 21 | config SELFMOD |
22 | bool "Use self modified code for intc/timer" | 22 | bool "Use self modified code for intc/timer" |
23 | depends on EXPERIMENTAL && NO_MMU | 23 | depends on NO_MMU |
24 | default n | 24 | default n |
25 | help | 25 | help |
26 | This choice enables self-modified code for interrupt controller | 26 | This choice enables self-modified code for interrupt controller |
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 9becc44d9d7a..5d7170bfeb28 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -169,7 +169,7 @@ config MACH_DECSTATION | |||
169 | select SYS_HAS_CPU_R3000 | 169 | select SYS_HAS_CPU_R3000 |
170 | select SYS_HAS_CPU_R4X00 | 170 | select SYS_HAS_CPU_R4X00 |
171 | select SYS_SUPPORTS_32BIT_KERNEL | 171 | select SYS_SUPPORTS_32BIT_KERNEL |
172 | select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL | 172 | select SYS_SUPPORTS_64BIT_KERNEL |
173 | select SYS_SUPPORTS_LITTLE_ENDIAN | 173 | select SYS_SUPPORTS_LITTLE_ENDIAN |
174 | select SYS_SUPPORTS_128HZ | 174 | select SYS_SUPPORTS_128HZ |
175 | select SYS_SUPPORTS_256HZ | 175 | select SYS_SUPPORTS_256HZ |
@@ -205,7 +205,7 @@ config MACH_JAZZ | |||
205 | select ISA | 205 | select ISA |
206 | select SYS_HAS_CPU_R4X00 | 206 | select SYS_HAS_CPU_R4X00 |
207 | select SYS_SUPPORTS_32BIT_KERNEL | 207 | select SYS_SUPPORTS_32BIT_KERNEL |
208 | select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL | 208 | select SYS_SUPPORTS_64BIT_KERNEL |
209 | select SYS_SUPPORTS_100HZ | 209 | select SYS_SUPPORTS_100HZ |
210 | help | 210 | help |
211 | This a family of machines based on the MIPS R4030 chipset which was | 211 | This a family of machines based on the MIPS R4030 chipset which was |
@@ -395,7 +395,6 @@ config PNX8550_STB810 | |||
395 | 395 | ||
396 | config PMC_MSP | 396 | config PMC_MSP |
397 | bool "PMC-Sierra MSP chipsets" | 397 | bool "PMC-Sierra MSP chipsets" |
398 | depends on EXPERIMENTAL | ||
399 | select CEVT_R4K | 398 | select CEVT_R4K |
400 | select CSRC_R4K | 399 | select CSRC_R4K |
401 | select DMA_NONCOHERENT | 400 | select DMA_NONCOHERENT |
@@ -494,8 +493,7 @@ config SGI_IP27 | |||
494 | here. | 493 | here. |
495 | 494 | ||
496 | config SGI_IP28 | 495 | config SGI_IP28 |
497 | bool "SGI IP28 (Indigo2 R10k) (EXPERIMENTAL)" | 496 | bool "SGI IP28 (Indigo2 R10k)" |
498 | depends on EXPERIMENTAL | ||
499 | select FW_ARC | 497 | select FW_ARC |
500 | select FW_ARC64 | 498 | select FW_ARC64 |
501 | select BOOT_ELF64 | 499 | select BOOT_ELF64 |
@@ -553,7 +551,6 @@ config SGI_IP32 | |||
553 | 551 | ||
554 | config SIBYTE_CRHINE | 552 | config SIBYTE_CRHINE |
555 | bool "Sibyte BCM91120C-CRhine" | 553 | bool "Sibyte BCM91120C-CRhine" |
556 | depends on EXPERIMENTAL | ||
557 | select BOOT_ELF32 | 554 | select BOOT_ELF32 |
558 | select DMA_COHERENT | 555 | select DMA_COHERENT |
559 | select SIBYTE_BCM1120 | 556 | select SIBYTE_BCM1120 |
@@ -564,7 +561,6 @@ config SIBYTE_CRHINE | |||
564 | 561 | ||
565 | config SIBYTE_CARMEL | 562 | config SIBYTE_CARMEL |
566 | bool "Sibyte BCM91120x-Carmel" | 563 | bool "Sibyte BCM91120x-Carmel" |
567 | depends on EXPERIMENTAL | ||
568 | select BOOT_ELF32 | 564 | select BOOT_ELF32 |
569 | select DMA_COHERENT | 565 | select DMA_COHERENT |
570 | select SIBYTE_BCM1120 | 566 | select SIBYTE_BCM1120 |
@@ -575,7 +571,6 @@ config SIBYTE_CARMEL | |||
575 | 571 | ||
576 | config SIBYTE_CRHONE | 572 | config SIBYTE_CRHONE |
577 | bool "Sibyte BCM91125C-CRhone" | 573 | bool "Sibyte BCM91125C-CRhone" |
578 | depends on EXPERIMENTAL | ||
579 | select BOOT_ELF32 | 574 | select BOOT_ELF32 |
580 | select DMA_COHERENT | 575 | select DMA_COHERENT |
581 | select SIBYTE_BCM1125 | 576 | select SIBYTE_BCM1125 |
@@ -587,7 +582,6 @@ config SIBYTE_CRHONE | |||
587 | 582 | ||
588 | config SIBYTE_RHONE | 583 | config SIBYTE_RHONE |
589 | bool "Sibyte BCM91125E-Rhone" | 584 | bool "Sibyte BCM91125E-Rhone" |
590 | depends on EXPERIMENTAL | ||
591 | select BOOT_ELF32 | 585 | select BOOT_ELF32 |
592 | select DMA_COHERENT | 586 | select DMA_COHERENT |
593 | select SIBYTE_BCM1125H | 587 | select SIBYTE_BCM1125H |
@@ -612,7 +606,6 @@ config SIBYTE_SWARM | |||
612 | 606 | ||
613 | config SIBYTE_LITTLESUR | 607 | config SIBYTE_LITTLESUR |
614 | bool "Sibyte BCM91250C2-LittleSur" | 608 | bool "Sibyte BCM91250C2-LittleSur" |
615 | depends on EXPERIMENTAL | ||
616 | select BOOT_ELF32 | 609 | select BOOT_ELF32 |
617 | select DMA_COHERENT | 610 | select DMA_COHERENT |
618 | select HAVE_PATA_PLATFORM | 611 | select HAVE_PATA_PLATFORM |
@@ -626,7 +619,6 @@ config SIBYTE_LITTLESUR | |||
626 | 619 | ||
627 | config SIBYTE_SENTOSA | 620 | config SIBYTE_SENTOSA |
628 | bool "Sibyte BCM91250E-Sentosa" | 621 | bool "Sibyte BCM91250E-Sentosa" |
629 | depends on EXPERIMENTAL | ||
630 | select BOOT_ELF32 | 622 | select BOOT_ELF32 |
631 | select DMA_COHERENT | 623 | select DMA_COHERENT |
632 | select NR_CPUS_DEFAULT_2 | 624 | select NR_CPUS_DEFAULT_2 |
@@ -675,7 +667,7 @@ config SNI_RM | |||
675 | select R5000_CPU_SCACHE | 667 | select R5000_CPU_SCACHE |
676 | select SYS_HAS_EARLY_PRINTK | 668 | select SYS_HAS_EARLY_PRINTK |
677 | select SYS_SUPPORTS_32BIT_KERNEL | 669 | select SYS_SUPPORTS_32BIT_KERNEL |
678 | select SYS_SUPPORTS_64BIT_KERNEL if EXPERIMENTAL | 670 | select SYS_SUPPORTS_64BIT_KERNEL |
679 | select SYS_SUPPORTS_BIG_ENDIAN | 671 | select SYS_SUPPORTS_BIG_ENDIAN |
680 | select SYS_SUPPORTS_HIGHMEM | 672 | select SYS_SUPPORTS_HIGHMEM |
681 | select SYS_SUPPORTS_LITTLE_ENDIAN | 673 | select SYS_SUPPORTS_LITTLE_ENDIAN |
@@ -779,7 +771,6 @@ config CAVIUM_OCTEON_REFERENCE_BOARD | |||
779 | 771 | ||
780 | config NLM_XLR_BOARD | 772 | config NLM_XLR_BOARD |
781 | bool "Netlogic XLR/XLS based systems" | 773 | bool "Netlogic XLR/XLS based systems" |
782 | depends on EXPERIMENTAL | ||
783 | select BOOT_ELF32 | 774 | select BOOT_ELF32 |
784 | select NLM_COMMON | 775 | select NLM_COMMON |
785 | select SYS_HAS_CPU_XLR | 776 | select SYS_HAS_CPU_XLR |
@@ -808,7 +799,6 @@ config NLM_XLR_BOARD | |||
808 | 799 | ||
809 | config NLM_XLP_BOARD | 800 | config NLM_XLP_BOARD |
810 | bool "Netlogic XLP based systems" | 801 | bool "Netlogic XLP based systems" |
811 | depends on EXPERIMENTAL | ||
812 | select BOOT_ELF32 | 802 | select BOOT_ELF32 |
813 | select NLM_COMMON | 803 | select NLM_COMMON |
814 | select SYS_HAS_CPU_XLP | 804 | select SYS_HAS_CPU_XLP |
@@ -1374,7 +1364,6 @@ config CPU_R5500 | |||
1374 | 1364 | ||
1375 | config CPU_R6000 | 1365 | config CPU_R6000 |
1376 | bool "R6000" | 1366 | bool "R6000" |
1377 | depends on EXPERIMENTAL | ||
1378 | depends on SYS_HAS_CPU_R6000 | 1367 | depends on SYS_HAS_CPU_R6000 |
1379 | select CPU_SUPPORTS_32BIT_KERNEL | 1368 | select CPU_SUPPORTS_32BIT_KERNEL |
1380 | help | 1369 | help |
@@ -1392,7 +1381,6 @@ config CPU_NEVADA | |||
1392 | 1381 | ||
1393 | config CPU_R8000 | 1382 | config CPU_R8000 |
1394 | bool "R8000" | 1383 | bool "R8000" |
1395 | depends on EXPERIMENTAL | ||
1396 | depends on SYS_HAS_CPU_R8000 | 1384 | depends on SYS_HAS_CPU_R8000 |
1397 | select CPU_HAS_PREFETCH | 1385 | select CPU_HAS_PREFETCH |
1398 | select CPU_SUPPORTS_64BIT_KERNEL | 1386 | select CPU_SUPPORTS_64BIT_KERNEL |
@@ -1767,7 +1755,7 @@ config PAGE_SIZE_4KB | |||
1767 | 1755 | ||
1768 | config PAGE_SIZE_8KB | 1756 | config PAGE_SIZE_8KB |
1769 | bool "8kB" | 1757 | bool "8kB" |
1770 | depends on (EXPERIMENTAL && CPU_R8000) || CPU_CAVIUM_OCTEON | 1758 | depends on CPU_R8000 || CPU_CAVIUM_OCTEON |
1771 | help | 1759 | help |
1772 | Using 8kB page size will result in higher performance kernel at | 1760 | Using 8kB page size will result in higher performance kernel at |
1773 | the price of higher memory consumption. This option is available | 1761 | the price of higher memory consumption. This option is available |
@@ -1794,7 +1782,7 @@ config PAGE_SIZE_32KB | |||
1794 | 1782 | ||
1795 | config PAGE_SIZE_64KB | 1783 | config PAGE_SIZE_64KB |
1796 | bool "64kB" | 1784 | bool "64kB" |
1797 | depends on EXPERIMENTAL && !CPU_R3000 && !CPU_TX39XX | 1785 | depends on !CPU_R3000 && !CPU_TX39XX |
1798 | help | 1786 | help |
1799 | Using 64kB page size will result in higher performance kernel at | 1787 | Using 64kB page size will result in higher performance kernel at |
1800 | the price of higher memory consumption. This option is available on | 1788 | the price of higher memory consumption. This option is available on |
@@ -2310,8 +2298,7 @@ config HZ | |||
2310 | source "kernel/Kconfig.preempt" | 2298 | source "kernel/Kconfig.preempt" |
2311 | 2299 | ||
2312 | config KEXEC | 2300 | config KEXEC |
2313 | bool "Kexec system call (EXPERIMENTAL)" | 2301 | bool "Kexec system call" |
2314 | depends on EXPERIMENTAL | ||
2315 | help | 2302 | help |
2316 | kexec is a system call that implements the ability to shutdown your | 2303 | kexec is a system call that implements the ability to shutdown your |
2317 | current kernel, and to start another kernel. It is like a reboot | 2304 | current kernel, and to start another kernel. It is like a reboot |
diff --git a/arch/mips/jazz/Kconfig b/arch/mips/jazz/Kconfig index 1f372b0d2559..fb1e072da30b 100644 --- a/arch/mips/jazz/Kconfig +++ b/arch/mips/jazz/Kconfig | |||
@@ -1,6 +1,6 @@ | |||
1 | config ACER_PICA_61 | 1 | config ACER_PICA_61 |
2 | bool "Support for Acer PICA 1 chipset (EXPERIMENTAL)" | 2 | bool "Support for Acer PICA 1 chipset" |
3 | depends on MACH_JAZZ && EXPERIMENTAL | 3 | depends on MACH_JAZZ |
4 | select DMA_NONCOHERENT | 4 | select DMA_NONCOHERENT |
5 | select SYS_SUPPORTS_LITTLE_ENDIAN | 5 | select SYS_SUPPORTS_LITTLE_ENDIAN |
6 | help | 6 | help |
@@ -13,7 +13,7 @@ config MIPS_MAGNUM_4000 | |||
13 | bool "Support for MIPS Magnum 4000" | 13 | bool "Support for MIPS Magnum 4000" |
14 | depends on MACH_JAZZ | 14 | depends on MACH_JAZZ |
15 | select DMA_NONCOHERENT | 15 | select DMA_NONCOHERENT |
16 | select SYS_SUPPORTS_BIG_ENDIAN if EXPERIMENTAL | 16 | select SYS_SUPPORTS_BIG_ENDIAN |
17 | select SYS_SUPPORTS_LITTLE_ENDIAN | 17 | select SYS_SUPPORTS_LITTLE_ENDIAN |
18 | help | 18 | help |
19 | This is a machine with a R4000 100 MHz CPU. To compile a Linux | 19 | This is a machine with a R4000 100 MHz CPU. To compile a Linux |
diff --git a/arch/mips/lantiq/xway/dma.c b/arch/mips/lantiq/xway/dma.c index e44a1866653f..08f7ebd9c774 100644 --- a/arch/mips/lantiq/xway/dma.c +++ b/arch/mips/lantiq/xway/dma.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <linux/dma-mapping.h> | 21 | #include <linux/dma-mapping.h> |
22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
23 | #include <linux/clk.h> | 23 | #include <linux/clk.h> |
24 | #include <linux/err.h> | ||
24 | 25 | ||
25 | #include <lantiq_soc.h> | 26 | #include <lantiq_soc.h> |
26 | #include <xway_dma.h> | 27 | #include <xway_dma.h> |
@@ -223,8 +224,8 @@ ltq_dma_init(struct platform_device *pdev) | |||
223 | panic("Failed to get dma resource"); | 224 | panic("Failed to get dma resource"); |
224 | 225 | ||
225 | /* remap dma register range */ | 226 | /* remap dma register range */ |
226 | ltq_dma_membase = devm_request_and_ioremap(&pdev->dev, res); | 227 | ltq_dma_membase = devm_ioremap_resource(&pdev->dev, res); |
227 | if (!ltq_dma_membase) | 228 | if (IS_ERR(ltq_dma_membase)) |
228 | panic("Failed to remap dma resource"); | 229 | panic("Failed to remap dma resource"); |
229 | 230 | ||
230 | /* power up and reset the dma engine */ | 231 | /* power up and reset the dma engine */ |
diff --git a/arch/mips/lantiq/xway/gptu.c b/arch/mips/lantiq/xway/gptu.c index e30b1ed1b936..9861c8669fab 100644 --- a/arch/mips/lantiq/xway/gptu.c +++ b/arch/mips/lantiq/xway/gptu.c | |||
@@ -150,11 +150,9 @@ static int gptu_probe(struct platform_device *pdev) | |||
150 | } | 150 | } |
151 | 151 | ||
152 | /* remap gptu register range */ | 152 | /* remap gptu register range */ |
153 | gptu_membase = devm_request_and_ioremap(&pdev->dev, res); | 153 | gptu_membase = devm_ioremap_resource(&pdev->dev, res); |
154 | if (!gptu_membase) { | 154 | if (IS_ERR(gptu_membase)) |
155 | dev_err(&pdev->dev, "Failed to remap resource\n"); | 155 | return PTR_ERR(gptu_membase); |
156 | return -ENOMEM; | ||
157 | } | ||
158 | 156 | ||
159 | /* enable our clock */ | 157 | /* enable our clock */ |
160 | clk = clk_get(&pdev->dev, NULL); | 158 | clk = clk_get(&pdev->dev, NULL); |
diff --git a/arch/mips/pci/pci-lantiq.c b/arch/mips/pci/pci-lantiq.c index 95681789b51e..910fb4c20b9e 100644 --- a/arch/mips/pci/pci-lantiq.c +++ b/arch/mips/pci/pci-lantiq.c | |||
@@ -214,13 +214,13 @@ static int ltq_pci_probe(struct platform_device *pdev) | |||
214 | return -EINVAL; | 214 | return -EINVAL; |
215 | } | 215 | } |
216 | 216 | ||
217 | ltq_pci_membase = devm_request_and_ioremap(&pdev->dev, res_bridge); | 217 | ltq_pci_membase = devm_ioremap_resource(&pdev->dev, res_bridge); |
218 | ltq_pci_mapped_cfg = devm_request_and_ioremap(&pdev->dev, res_cfg); | 218 | if (IS_ERR(ltq_pci_membase)) |
219 | return PTR_ERR(ltq_pci_membase); | ||
219 | 220 | ||
220 | if (!ltq_pci_membase || !ltq_pci_mapped_cfg) { | 221 | ltq_pci_mapped_cfg = devm_ioremap_resource(&pdev->dev, res_cfg); |
221 | dev_err(&pdev->dev, "failed to remap resources\n"); | 222 | if (IS_ERR(ltq_pci_mapped_cfg)) |
222 | return -ENOMEM; | 223 | return PTR_ERR(ltq_pci_mapped_cfg); |
223 | } | ||
224 | 224 | ||
225 | ltq_pci_startup(pdev); | 225 | ltq_pci_startup(pdev); |
226 | 226 | ||
diff --git a/arch/mips/sgi-ip27/Kconfig b/arch/mips/sgi-ip27/Kconfig index 4b2ea282b9c7..4d8705a65e4a 100644 --- a/arch/mips/sgi-ip27/Kconfig +++ b/arch/mips/sgi-ip27/Kconfig | |||
@@ -13,7 +13,6 @@ config SGI_SN_M_MODE | |||
13 | 13 | ||
14 | config SGI_SN_N_MODE | 14 | config SGI_SN_N_MODE |
15 | bool "IP27 N-Mode" | 15 | bool "IP27 N-Mode" |
16 | depends on EXPERIMENTAL | ||
17 | help | 16 | help |
18 | The nodes of Origin, Onyx, Fuel and Tezro systems can be configured | 17 | The nodes of Origin, Onyx, Fuel and Tezro systems can be configured |
19 | in either N-Modes which allows for more nodes or M-Mode which allows | 18 | in either N-Modes which allows for more nodes or M-Mode which allows |
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig index a32e34ecda9e..9f2820659da2 100644 --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig | |||
@@ -192,12 +192,12 @@ config PARISC_PAGE_SIZE_4KB | |||
192 | If you don't know what to do, choose 4KB. | 192 | If you don't know what to do, choose 4KB. |
193 | 193 | ||
194 | config PARISC_PAGE_SIZE_16KB | 194 | config PARISC_PAGE_SIZE_16KB |
195 | bool "16KB (EXPERIMENTAL)" | 195 | bool "16KB" |
196 | depends on PA8X00 && EXPERIMENTAL | 196 | depends on PA8X00 |
197 | 197 | ||
198 | config PARISC_PAGE_SIZE_64KB | 198 | config PARISC_PAGE_SIZE_64KB |
199 | bool "64KB (EXPERIMENTAL)" | 199 | bool "64KB" |
200 | depends on PA8X00 && EXPERIMENTAL | 200 | depends on PA8X00 |
201 | 201 | ||
202 | endchoice | 202 | endchoice |
203 | 203 | ||
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 561ccca7b1a7..e7fb8edb629b 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -332,7 +332,7 @@ config SWIOTLB | |||
332 | 332 | ||
333 | config HOTPLUG_CPU | 333 | config HOTPLUG_CPU |
334 | bool "Support for enabling/disabling CPUs" | 334 | bool "Support for enabling/disabling CPUs" |
335 | depends on SMP && HOTPLUG && EXPERIMENTAL && (PPC_PSERIES || \ | 335 | depends on SMP && HOTPLUG && (PPC_PSERIES || \ |
336 | PPC_PMAC || PPC_POWERNV || (PPC_85xx && !PPC_E500MC)) | 336 | PPC_PMAC || PPC_POWERNV || (PPC_85xx && !PPC_E500MC)) |
337 | ---help--- | 337 | ---help--- |
338 | Say Y here to be able to disable and re-enable individual | 338 | Say Y here to be able to disable and re-enable individual |
@@ -354,8 +354,8 @@ config ARCH_ENABLE_MEMORY_HOTREMOVE | |||
354 | def_bool y | 354 | def_bool y |
355 | 355 | ||
356 | config KEXEC | 356 | config KEXEC |
357 | bool "kexec system call (EXPERIMENTAL)" | 357 | bool "kexec system call" |
358 | depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP)) && EXPERIMENTAL | 358 | depends on (PPC_BOOK3S || FSL_BOOKE || (44x && !SMP)) |
359 | help | 359 | help |
360 | kexec is a system call that implements the ability to shutdown your | 360 | kexec is a system call that implements the ability to shutdown your |
361 | current kernel, and to start another kernel. It is like a reboot | 361 | current kernel, and to start another kernel. It is like a reboot |
@@ -850,8 +850,8 @@ config LOWMEM_CAM_NUM | |||
850 | default 3 | 850 | default 3 |
851 | 851 | ||
852 | config DYNAMIC_MEMSTART | 852 | config DYNAMIC_MEMSTART |
853 | bool "Enable page aligned dynamic load address for kernel (EXPERIMENTAL)" | 853 | bool "Enable page aligned dynamic load address for kernel" |
854 | depends on EXPERIMENTAL && ADVANCED_OPTIONS && FLATMEM && (FSL_BOOKE || 44x) | 854 | depends on ADVANCED_OPTIONS && FLATMEM && (FSL_BOOKE || 44x) |
855 | select NONSTATIC_KERNEL | 855 | select NONSTATIC_KERNEL |
856 | help | 856 | help |
857 | This option enables the kernel to be loaded at any page aligned | 857 | This option enables the kernel to be loaded at any page aligned |
@@ -868,8 +868,8 @@ config DYNAMIC_MEMSTART | |||
868 | This option is overridden by CONFIG_RELOCATABLE | 868 | This option is overridden by CONFIG_RELOCATABLE |
869 | 869 | ||
870 | config RELOCATABLE | 870 | config RELOCATABLE |
871 | bool "Build a relocatable kernel (EXPERIMENTAL)" | 871 | bool "Build a relocatable kernel" |
872 | depends on EXPERIMENTAL && ADVANCED_OPTIONS && FLATMEM && 44x | 872 | depends on ADVANCED_OPTIONS && FLATMEM && 44x |
873 | select NONSTATIC_KERNEL | 873 | select NONSTATIC_KERNEL |
874 | help | 874 | help |
875 | This builds a kernel image that is capable of running at the | 875 | This builds a kernel image that is capable of running at the |
diff --git a/arch/powerpc/kvm/Kconfig b/arch/powerpc/kvm/Kconfig index 4730c953f435..63c67ec72e43 100644 --- a/arch/powerpc/kvm/Kconfig +++ b/arch/powerpc/kvm/Kconfig | |||
@@ -41,7 +41,7 @@ config KVM_BOOK3S_PR | |||
41 | 41 | ||
42 | config KVM_BOOK3S_32 | 42 | config KVM_BOOK3S_32 |
43 | tristate "KVM support for PowerPC book3s_32 processors" | 43 | tristate "KVM support for PowerPC book3s_32 processors" |
44 | depends on EXPERIMENTAL && PPC_BOOK3S_32 && !SMP && !PTE_64BIT | 44 | depends on PPC_BOOK3S_32 && !SMP && !PTE_64BIT |
45 | select KVM | 45 | select KVM |
46 | select KVM_BOOK3S_32_HANDLER | 46 | select KVM_BOOK3S_32_HANDLER |
47 | select KVM_BOOK3S_PR | 47 | select KVM_BOOK3S_PR |
@@ -56,7 +56,7 @@ config KVM_BOOK3S_32 | |||
56 | 56 | ||
57 | config KVM_BOOK3S_64 | 57 | config KVM_BOOK3S_64 |
58 | tristate "KVM support for PowerPC book3s_64 processors" | 58 | tristate "KVM support for PowerPC book3s_64 processors" |
59 | depends on EXPERIMENTAL && PPC_BOOK3S_64 | 59 | depends on PPC_BOOK3S_64 |
60 | select KVM_BOOK3S_64_HANDLER | 60 | select KVM_BOOK3S_64_HANDLER |
61 | select KVM | 61 | select KVM |
62 | ---help--- | 62 | ---help--- |
@@ -97,7 +97,7 @@ config KVM_BOOKE_HV | |||
97 | 97 | ||
98 | config KVM_440 | 98 | config KVM_440 |
99 | bool "KVM support for PowerPC 440 processors" | 99 | bool "KVM support for PowerPC 440 processors" |
100 | depends on EXPERIMENTAL && 44x | 100 | depends on 44x |
101 | select KVM | 101 | select KVM |
102 | select KVM_MMIO | 102 | select KVM_MMIO |
103 | ---help--- | 103 | ---help--- |
@@ -122,7 +122,7 @@ config KVM_EXIT_TIMING | |||
122 | 122 | ||
123 | config KVM_E500V2 | 123 | config KVM_E500V2 |
124 | bool "KVM support for PowerPC E500v2 processors" | 124 | bool "KVM support for PowerPC E500v2 processors" |
125 | depends on EXPERIMENTAL && E500 && !PPC_E500MC | 125 | depends on E500 && !PPC_E500MC |
126 | select KVM | 126 | select KVM |
127 | select KVM_MMIO | 127 | select KVM_MMIO |
128 | select MMU_NOTIFIER | 128 | select MMU_NOTIFIER |
@@ -137,7 +137,7 @@ config KVM_E500V2 | |||
137 | 137 | ||
138 | config KVM_E500MC | 138 | config KVM_E500MC |
139 | bool "KVM support for PowerPC E500MC/E5500 processors" | 139 | bool "KVM support for PowerPC E500MC/E5500 processors" |
140 | depends on EXPERIMENTAL && PPC_E500MC | 140 | depends on PPC_E500MC |
141 | select KVM | 141 | select KVM |
142 | select KVM_MMIO | 142 | select KVM_MMIO |
143 | select KVM_BOOKE_HV | 143 | select KVM_BOOKE_HV |
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig index 02d02a09942d..92ab60a62711 100644 --- a/arch/powerpc/platforms/85xx/Kconfig +++ b/arch/powerpc/platforms/85xx/Kconfig | |||
@@ -277,7 +277,6 @@ config P5040_DS | |||
277 | 277 | ||
278 | config PPC_QEMU_E500 | 278 | config PPC_QEMU_E500 |
279 | bool "QEMU generic e500 platform" | 279 | bool "QEMU generic e500 platform" |
280 | depends on EXPERIMENTAL | ||
281 | select DEFAULT_UIMAGE | 280 | select DEFAULT_UIMAGE |
282 | help | 281 | help |
283 | This option enables support for running as a QEMU guest using | 282 | This option enables support for running as a QEMU guest using |
diff --git a/arch/powerpc/platforms/cell/Kconfig b/arch/powerpc/platforms/cell/Kconfig index 2e7ff0c5cf42..53aaefeb3386 100644 --- a/arch/powerpc/platforms/cell/Kconfig +++ b/arch/powerpc/platforms/cell/Kconfig | |||
@@ -124,7 +124,7 @@ config CBE_CPUFREQ | |||
124 | 124 | ||
125 | config CBE_CPUFREQ_PMI_ENABLE | 125 | config CBE_CPUFREQ_PMI_ENABLE |
126 | bool "CBE frequency scaling using PMI interface" | 126 | bool "CBE frequency scaling using PMI interface" |
127 | depends on CBE_CPUFREQ && EXPERIMENTAL | 127 | depends on CBE_CPUFREQ |
128 | default n | 128 | default n |
129 | help | 129 | help |
130 | Select this, if you want to use the PMI interface | 130 | Select this, if you want to use the PMI interface |
diff --git a/arch/powerpc/platforms/ps3/Kconfig b/arch/powerpc/platforms/ps3/Kconfig index 46b7f0232523..e87c19473973 100644 --- a/arch/powerpc/platforms/ps3/Kconfig +++ b/arch/powerpc/platforms/ps3/Kconfig | |||
@@ -48,7 +48,7 @@ config PS3_HTAB_SIZE | |||
48 | system will have optimal runtime performance. | 48 | system will have optimal runtime performance. |
49 | 49 | ||
50 | config PS3_DYNAMIC_DMA | 50 | config PS3_DYNAMIC_DMA |
51 | depends on PPC_PS3 && EXPERIMENTAL | 51 | depends on PPC_PS3 |
52 | bool "PS3 Platform dynamic DMA page table management" | 52 | bool "PS3 Platform dynamic DMA page table management" |
53 | default n | 53 | default n |
54 | help | 54 | help |
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index c15ba7d1be64..27c91c38d1a1 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig | |||
@@ -717,8 +717,8 @@ source "arch/s390/kvm/Kconfig" | |||
717 | 717 | ||
718 | config S390_GUEST | 718 | config S390_GUEST |
719 | def_bool y | 719 | def_bool y |
720 | prompt "s390 support for virtio devices (EXPERIMENTAL)" | 720 | prompt "s390 support for virtio devices" |
721 | depends on 64BIT && EXPERIMENTAL | 721 | depends on 64BIT |
722 | select VIRTUALIZATION | 722 | select VIRTUALIZATION |
723 | select VIRTIO | 723 | select VIRTIO |
724 | select VIRTIO_CONSOLE | 724 | select VIRTIO_CONSOLE |
diff --git a/arch/s390/kvm/Kconfig b/arch/s390/kvm/Kconfig index b58dd869cb32..60f9f8ae0fc8 100644 --- a/arch/s390/kvm/Kconfig +++ b/arch/s390/kvm/Kconfig | |||
@@ -18,7 +18,7 @@ if VIRTUALIZATION | |||
18 | config KVM | 18 | config KVM |
19 | def_tristate y | 19 | def_tristate y |
20 | prompt "Kernel-based Virtual Machine (KVM) support" | 20 | prompt "Kernel-based Virtual Machine (KVM) support" |
21 | depends on HAVE_KVM && EXPERIMENTAL | 21 | depends on HAVE_KVM |
22 | select PREEMPT_NOTIFIERS | 22 | select PREEMPT_NOTIFIERS |
23 | select ANON_INODES | 23 | select ANON_INODES |
24 | select HAVE_KVM_CPU_RELAX_INTERCEPT | 24 | select HAVE_KVM_CPU_RELAX_INTERCEPT |
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 9c833c585871..87f720037ff7 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
@@ -644,7 +644,7 @@ source kernel/Kconfig.hz | |||
644 | 644 | ||
645 | config KEXEC | 645 | config KEXEC |
646 | bool "kexec system call (EXPERIMENTAL)" | 646 | bool "kexec system call (EXPERIMENTAL)" |
647 | depends on SUPERH32 && EXPERIMENTAL && MMU | 647 | depends on SUPERH32 && MMU |
648 | help | 648 | help |
649 | kexec is a system call that implements the ability to shutdown your | 649 | kexec is a system call that implements the ability to shutdown your |
650 | current kernel, and to start another kernel. It is like a reboot | 650 | current kernel, and to start another kernel. It is like a reboot |
@@ -661,7 +661,7 @@ config KEXEC | |||
661 | 661 | ||
662 | config CRASH_DUMP | 662 | config CRASH_DUMP |
663 | bool "kernel crash dumps (EXPERIMENTAL)" | 663 | bool "kernel crash dumps (EXPERIMENTAL)" |
664 | depends on SUPERH32 && EXPERIMENTAL && BROKEN_ON_SMP | 664 | depends on SUPERH32 && BROKEN_ON_SMP |
665 | help | 665 | help |
666 | Generate crash dump after being started by kexec. | 666 | Generate crash dump after being started by kexec. |
667 | This should be normally only set in special crash dump kernels | 667 | This should be normally only set in special crash dump kernels |
@@ -675,7 +675,7 @@ config CRASH_DUMP | |||
675 | 675 | ||
676 | config KEXEC_JUMP | 676 | config KEXEC_JUMP |
677 | bool "kexec jump (EXPERIMENTAL)" | 677 | bool "kexec jump (EXPERIMENTAL)" |
678 | depends on SUPERH32 && KEXEC && HIBERNATION && EXPERIMENTAL | 678 | depends on SUPERH32 && KEXEC && HIBERNATION |
679 | help | 679 | help |
680 | Jump between original kernel and kexeced kernel and invoke | 680 | Jump between original kernel and kexeced kernel and invoke |
681 | code via KEXEC | 681 | code via KEXEC |
@@ -709,7 +709,7 @@ config SECCOMP | |||
709 | 709 | ||
710 | config CC_STACKPROTECTOR | 710 | config CC_STACKPROTECTOR |
711 | bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)" | 711 | bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)" |
712 | depends on SUPERH32 && EXPERIMENTAL | 712 | depends on SUPERH32 |
713 | help | 713 | help |
714 | This option turns on the -fstack-protector GCC feature. This | 714 | This option turns on the -fstack-protector GCC feature. This |
715 | feature puts, at the beginning of functions, a canary value on | 715 | feature puts, at the beginning of functions, a canary value on |
@@ -760,7 +760,7 @@ config NR_CPUS | |||
760 | 760 | ||
761 | config HOTPLUG_CPU | 761 | config HOTPLUG_CPU |
762 | bool "Support for hot-pluggable CPUs (EXPERIMENTAL)" | 762 | bool "Support for hot-pluggable CPUs (EXPERIMENTAL)" |
763 | depends on SMP && HOTPLUG && EXPERIMENTAL | 763 | depends on SMP && HOTPLUG |
764 | help | 764 | help |
765 | Say Y here to experiment with turning CPUs off and on. CPUs | 765 | Say Y here to experiment with turning CPUs off and on. CPUs |
766 | can be controlled through /sys/devices/system/cpu. | 766 | can be controlled through /sys/devices/system/cpu. |
@@ -839,7 +839,7 @@ config ENTRY_OFFSET | |||
839 | 839 | ||
840 | config ROMIMAGE_MMCIF | 840 | config ROMIMAGE_MMCIF |
841 | bool "Include MMCIF loader in romImage (EXPERIMENTAL)" | 841 | bool "Include MMCIF loader in romImage (EXPERIMENTAL)" |
842 | depends on CPU_SUBTYPE_SH7724 && EXPERIMENTAL | 842 | depends on CPU_SUBTYPE_SH7724 |
843 | help | 843 | help |
844 | Say Y here to include experimental MMCIF loading code in | 844 | Say Y here to include experimental MMCIF loading code in |
845 | romImage. With this enabled it is possible to write the romImage | 845 | romImage. With this enabled it is possible to write the romImage |
@@ -925,7 +925,6 @@ source "fs/Kconfig.binfmt" | |||
925 | endmenu | 925 | endmenu |
926 | 926 | ||
927 | menu "Power management options (EXPERIMENTAL)" | 927 | menu "Power management options (EXPERIMENTAL)" |
928 | depends on EXPERIMENTAL | ||
929 | 928 | ||
930 | source "kernel/power/Kconfig" | 929 | source "kernel/power/Kconfig" |
931 | 930 | ||
diff --git a/arch/sh/Kconfig.cpu b/arch/sh/Kconfig.cpu index 770ff2d5b94d..05b518e90cf7 100644 --- a/arch/sh/Kconfig.cpu +++ b/arch/sh/Kconfig.cpu | |||
@@ -33,7 +33,7 @@ config SH64_FPU_DENORM_FLUSH | |||
33 | config SH_FPU_EMU | 33 | config SH_FPU_EMU |
34 | def_bool n | 34 | def_bool n |
35 | prompt "FPU emulation support" | 35 | prompt "FPU emulation support" |
36 | depends on !SH_FPU && EXPERIMENTAL | 36 | depends on !SH_FPU |
37 | help | 37 | help |
38 | Selecting this option will enable support for software FPU emulation. | 38 | Selecting this option will enable support for software FPU emulation. |
39 | Most SH-3 users will want to say Y here, whereas most SH-4 users will | 39 | Most SH-3 users will want to say Y here, whereas most SH-4 users will |
@@ -68,7 +68,6 @@ config SH_STORE_QUEUES | |||
68 | 68 | ||
69 | config SPECULATIVE_EXECUTION | 69 | config SPECULATIVE_EXECUTION |
70 | bool "Speculative subroutine return" | 70 | bool "Speculative subroutine return" |
71 | depends on EXPERIMENTAL | ||
72 | depends on CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785 || CPU_SUBTYPE_SH7786 | 71 | depends on CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7785 || CPU_SUBTYPE_SH7786 |
73 | help | 72 | help |
74 | This enables support for a speculative instruction fetch for | 73 | This enables support for a speculative instruction fetch for |
diff --git a/arch/sh/mm/Kconfig b/arch/sh/mm/Kconfig index 0f7c852f355c..5a43a871e097 100644 --- a/arch/sh/mm/Kconfig +++ b/arch/sh/mm/Kconfig | |||
@@ -83,7 +83,7 @@ config 32BIT | |||
83 | 83 | ||
84 | config PMB | 84 | config PMB |
85 | bool "Support 32-bit physical addressing through PMB" | 85 | bool "Support 32-bit physical addressing through PMB" |
86 | depends on MMU && EXPERIMENTAL && CPU_SH4A && !CPU_SH4AL_DSP | 86 | depends on MMU && CPU_SH4A && !CPU_SH4AL_DSP |
87 | select 32BIT | 87 | select 32BIT |
88 | select UNCACHED_MAPPING | 88 | select UNCACHED_MAPPING |
89 | help | 89 | help |
@@ -110,7 +110,7 @@ config VSYSCALL | |||
110 | 110 | ||
111 | config NUMA | 111 | config NUMA |
112 | bool "Non Uniform Memory Access (NUMA) Support" | 112 | bool "Non Uniform Memory Access (NUMA) Support" |
113 | depends on MMU && SYS_SUPPORTS_NUMA && EXPERIMENTAL | 113 | depends on MMU && SYS_SUPPORTS_NUMA |
114 | select ARCH_WANT_NUMA_VARIABLE_LOCALITY | 114 | select ARCH_WANT_NUMA_VARIABLE_LOCALITY |
115 | default n | 115 | default n |
116 | help | 116 | help |
diff --git a/arch/tile/kvm/Kconfig b/arch/tile/kvm/Kconfig index 669fcdba31ea..2298cb1daff7 100644 --- a/arch/tile/kvm/Kconfig +++ b/arch/tile/kvm/Kconfig | |||
@@ -18,7 +18,7 @@ if VIRTUALIZATION | |||
18 | 18 | ||
19 | config KVM | 19 | config KVM |
20 | tristate "Kernel-based Virtual Machine (KVM) support" | 20 | tristate "Kernel-based Virtual Machine (KVM) support" |
21 | depends on HAVE_KVM && MODULES && EXPERIMENTAL | 21 | depends on HAVE_KVM && MODULES |
22 | select PREEMPT_NOTIFIERS | 22 | select PREEMPT_NOTIFIERS |
23 | select ANON_INODES | 23 | select ANON_INODES |
24 | ---help--- | 24 | ---help--- |
diff --git a/arch/um/Kconfig.net b/arch/um/Kconfig.net index 3160b1a5adb7..820a56f00332 100644 --- a/arch/um/Kconfig.net +++ b/arch/um/Kconfig.net | |||
@@ -157,7 +157,7 @@ config UML_NET_MCAST | |||
157 | 157 | ||
158 | config UML_NET_PCAP | 158 | config UML_NET_PCAP |
159 | bool "pcap transport" | 159 | bool "pcap transport" |
160 | depends on UML_NET && EXPERIMENTAL | 160 | depends on UML_NET |
161 | help | 161 | help |
162 | The pcap transport makes a pcap packet stream on the host look | 162 | The pcap transport makes a pcap packet stream on the host look |
163 | like an ethernet device inside UML. This is useful for making | 163 | like an ethernet device inside UML. This is useful for making |
diff --git a/arch/um/Kconfig.um b/arch/um/Kconfig.um index bf87f25eb2de..a7520c90f62d 100644 --- a/arch/um/Kconfig.um +++ b/arch/um/Kconfig.um | |||
@@ -45,8 +45,8 @@ config HOSTFS | |||
45 | say Y or M here; otherwise say N. | 45 | say Y or M here; otherwise say N. |
46 | 46 | ||
47 | config HPPFS | 47 | config HPPFS |
48 | tristate "HoneyPot ProcFS (EXPERIMENTAL)" | 48 | tristate "HoneyPot ProcFS" |
49 | depends on EXPERIMENTAL && PROC_FS | 49 | depends on PROC_FS |
50 | help | 50 | help |
51 | hppfs (HoneyPot ProcFS) is a filesystem which allows UML /proc | 51 | hppfs (HoneyPot ProcFS) is a filesystem which allows UML /proc |
52 | entries to be overridden, removed, or fabricated from the host. | 52 | entries to be overridden, removed, or fabricated from the host. |
@@ -96,7 +96,7 @@ config MAGIC_SYSRQ | |||
96 | unless you really know what this hack does. | 96 | unless you really know what this hack does. |
97 | 97 | ||
98 | config SMP | 98 | config SMP |
99 | bool "Symmetric multi-processing support (EXPERIMENTAL)" | 99 | bool "Symmetric multi-processing support" |
100 | default n | 100 | default n |
101 | depends on BROKEN | 101 | depends on BROKEN |
102 | help | 102 | help |
@@ -126,7 +126,7 @@ config NR_CPUS | |||
126 | default "32" | 126 | default "32" |
127 | 127 | ||
128 | config HIGHMEM | 128 | config HIGHMEM |
129 | bool "Highmem support (EXPERIMENTAL)" | 129 | bool "Highmem support" |
130 | depends on !64BIT && BROKEN | 130 | depends on !64BIT && BROKEN |
131 | default n | 131 | default n |
132 | help | 132 | help |
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index f7a27fdb5098..63c0431daa3a 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -225,7 +225,7 @@ config ARCH_SUPPORTS_DEBUG_PAGEALLOC | |||
225 | 225 | ||
226 | config HAVE_INTEL_TXT | 226 | config HAVE_INTEL_TXT |
227 | def_bool y | 227 | def_bool y |
228 | depends on EXPERIMENTAL && INTEL_IOMMU && ACPI | 228 | depends on INTEL_IOMMU && ACPI |
229 | 229 | ||
230 | config X86_32_SMP | 230 | config X86_32_SMP |
231 | def_bool y | 231 | def_bool y |
@@ -642,7 +642,7 @@ config PARAVIRT | |||
642 | 642 | ||
643 | config PARAVIRT_SPINLOCKS | 643 | config PARAVIRT_SPINLOCKS |
644 | bool "Paravirtualization layer for spinlocks" | 644 | bool "Paravirtualization layer for spinlocks" |
645 | depends on PARAVIRT && SMP && EXPERIMENTAL | 645 | depends on PARAVIRT && SMP |
646 | ---help--- | 646 | ---help--- |
647 | Paravirtualized spinlocks allow a pvops backend to replace the | 647 | Paravirtualized spinlocks allow a pvops backend to replace the |
648 | spinlock implementation with something virtualization-friendly | 648 | spinlock implementation with something virtualization-friendly |
@@ -754,7 +754,7 @@ config GART_IOMMU | |||
754 | config CALGARY_IOMMU | 754 | config CALGARY_IOMMU |
755 | bool "IBM Calgary IOMMU support" | 755 | bool "IBM Calgary IOMMU support" |
756 | select SWIOTLB | 756 | select SWIOTLB |
757 | depends on X86_64 && PCI && EXPERIMENTAL | 757 | depends on X86_64 && PCI |
758 | ---help--- | 758 | ---help--- |
759 | Support for hardware IOMMUs in IBM's xSeries x366 and x460 | 759 | Support for hardware IOMMUs in IBM's xSeries x366 and x460 |
760 | systems. Needed to run systems with more than 3GB of memory | 760 | systems. Needed to run systems with more than 3GB of memory |
@@ -796,7 +796,7 @@ config IOMMU_HELPER | |||
796 | 796 | ||
797 | config MAXSMP | 797 | config MAXSMP |
798 | bool "Enable Maximum number of SMP Processors and NUMA Nodes" | 798 | bool "Enable Maximum number of SMP Processors and NUMA Nodes" |
799 | depends on X86_64 && SMP && DEBUG_KERNEL && EXPERIMENTAL | 799 | depends on X86_64 && SMP && DEBUG_KERNEL |
800 | select CPUMASK_OFFSTACK | 800 | select CPUMASK_OFFSTACK |
801 | ---help--- | 801 | ---help--- |
802 | Enable maximum number of CPUS and NUMA Nodes for this architecture. | 802 | Enable maximum number of CPUS and NUMA Nodes for this architecture. |
@@ -1132,7 +1132,6 @@ config HIGHMEM64G | |||
1132 | endchoice | 1132 | endchoice |
1133 | 1133 | ||
1134 | choice | 1134 | choice |
1135 | depends on EXPERIMENTAL | ||
1136 | prompt "Memory split" if EXPERT | 1135 | prompt "Memory split" if EXPERT |
1137 | default VMSPLIT_3G | 1136 | default VMSPLIT_3G |
1138 | depends on X86_32 | 1137 | depends on X86_32 |
@@ -1209,7 +1208,7 @@ config DIRECT_GBPAGES | |||
1209 | config NUMA | 1208 | config NUMA |
1210 | bool "Numa Memory Allocation and Scheduler Support" | 1209 | bool "Numa Memory Allocation and Scheduler Support" |
1211 | depends on SMP | 1210 | depends on SMP |
1212 | depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_BIGSMP || X86_SUMMIT && ACPI) && EXPERIMENTAL) | 1211 | depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_BIGSMP || X86_SUMMIT && ACPI)) |
1213 | default y if (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP) | 1212 | default y if (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP) |
1214 | ---help--- | 1213 | ---help--- |
1215 | Enable NUMA (Non Uniform Memory Access) support. | 1214 | Enable NUMA (Non Uniform Memory Access) support. |
@@ -1304,7 +1303,7 @@ config ARCH_DISCONTIGMEM_DEFAULT | |||
1304 | 1303 | ||
1305 | config ARCH_SPARSEMEM_ENABLE | 1304 | config ARCH_SPARSEMEM_ENABLE |
1306 | def_bool y | 1305 | def_bool y |
1307 | depends on X86_64 || NUMA || (EXPERIMENTAL && X86_32) || X86_32_NON_STANDARD | 1306 | depends on X86_64 || NUMA || X86_32 || X86_32_NON_STANDARD |
1308 | select SPARSEMEM_STATIC if X86_32 | 1307 | select SPARSEMEM_STATIC if X86_32 |
1309 | select SPARSEMEM_VMEMMAP_ENABLE if X86_64 | 1308 | select SPARSEMEM_VMEMMAP_ENABLE if X86_64 |
1310 | 1309 | ||
@@ -1618,8 +1617,7 @@ config CRASH_DUMP | |||
1618 | For more details see Documentation/kdump/kdump.txt | 1617 | For more details see Documentation/kdump/kdump.txt |
1619 | 1618 | ||
1620 | config KEXEC_JUMP | 1619 | config KEXEC_JUMP |
1621 | bool "kexec jump (EXPERIMENTAL)" | 1620 | bool "kexec jump" |
1622 | depends on EXPERIMENTAL | ||
1623 | depends on KEXEC && HIBERNATION | 1621 | depends on KEXEC && HIBERNATION |
1624 | ---help--- | 1622 | ---help--- |
1625 | Jump between original kernel and kexeced kernel and invoke | 1623 | Jump between original kernel and kexeced kernel and invoke |
@@ -2063,7 +2061,7 @@ config PCI_MMCONFIG | |||
2063 | 2061 | ||
2064 | config PCI_CNB20LE_QUIRK | 2062 | config PCI_CNB20LE_QUIRK |
2065 | bool "Read CNB20LE Host Bridge Windows" if EXPERT | 2063 | bool "Read CNB20LE Host Bridge Windows" if EXPERT |
2066 | depends on PCI && EXPERIMENTAL | 2064 | depends on PCI |
2067 | help | 2065 | help |
2068 | Read the PCI windows out of the CNB20LE host bridge. This allows | 2066 | Read the PCI windows out of the CNB20LE host bridge. This allows |
2069 | PCI hotplug to work on systems with the CNB20LE chipset which do | 2067 | PCI hotplug to work on systems with the CNB20LE chipset which do |
@@ -2267,8 +2265,8 @@ config IA32_AOUT | |||
2267 | Support old a.out binaries in the 32bit emulation. | 2265 | Support old a.out binaries in the 32bit emulation. |
2268 | 2266 | ||
2269 | config X86_X32 | 2267 | config X86_X32 |
2270 | bool "x32 ABI for 64-bit mode (EXPERIMENTAL)" | 2268 | bool "x32 ABI for 64-bit mode" |
2271 | depends on X86_64 && IA32_EMULATION && EXPERIMENTAL | 2269 | depends on X86_64 && IA32_EMULATION |
2272 | ---help--- | 2270 | ---help--- |
2273 | Include code to run binaries for the x32 native 32-bit ABI | 2271 | Include code to run binaries for the x32 native 32-bit ABI |
2274 | for 64-bit processors. An x32 process gets access to the | 2272 | for 64-bit processors. An x32 process gets access to the |
diff --git a/arch/x86/um/Kconfig b/arch/x86/um/Kconfig index 53c90fd412d1..21a13ce1d751 100644 --- a/arch/x86/um/Kconfig +++ b/arch/x86/um/Kconfig | |||
@@ -37,9 +37,8 @@ config RWSEM_GENERIC_SPINLOCK | |||
37 | def_bool !RWSEM_XCHGADD_ALGORITHM | 37 | def_bool !RWSEM_XCHGADD_ALGORITHM |
38 | 38 | ||
39 | config 3_LEVEL_PGTABLES | 39 | config 3_LEVEL_PGTABLES |
40 | bool "Three-level pagetables (EXPERIMENTAL)" if !64BIT | 40 | bool "Three-level pagetables" if !64BIT |
41 | default 64BIT | 41 | default 64BIT |
42 | depends on EXPERIMENTAL | ||
43 | help | 42 | help |
44 | Three-level pagetables will let UML have more than 4G of physical | 43 | Three-level pagetables will let UML have more than 4G of physical |
45 | memory. All the memory that can't be mapped directly will be treated | 44 | memory. All the memory that can't be mapped directly will be treated |