diff options
Diffstat (limited to 'sys-kernel/linux-sources-redcore-lts/files/4.14-0002-Make-preemptible-kernel-default.patch')
| -rw-r--r-- | sys-kernel/linux-sources-redcore-lts/files/4.14-0002-Make-preemptible-kernel-default.patch | 733 |
1 files changed, 0 insertions, 733 deletions
diff --git a/sys-kernel/linux-sources-redcore-lts/files/4.14-0002-Make-preemptible-kernel-default.patch b/sys-kernel/linux-sources-redcore-lts/files/4.14-0002-Make-preemptible-kernel-default.patch deleted file mode 100644 index 69abb373..00000000 --- a/sys-kernel/linux-sources-redcore-lts/files/4.14-0002-Make-preemptible-kernel-default.patch +++ /dev/null @@ -1,733 +0,0 @@ -From e8e37da685f7988182d7920a711e00dd2457af65 Mon Sep 17 00:00:00 2001 -From: Con Kolivas <kernel@kolivas.org> -Date: Sat, 29 Oct 2016 11:20:37 +1100 -Subject: [PATCH 02/16] Make preemptible kernel default. - -Make full preempt default on all arches. ---- - arch/arc/configs/tb10x_defconfig | 2 +- - arch/arm/configs/bcm2835_defconfig | 2 +- - arch/arm/configs/imx_v6_v7_defconfig | 2 +- - arch/arm/configs/mps2_defconfig | 2 +- - arch/arm/configs/mxs_defconfig | 2 +- - arch/blackfin/configs/BF518F-EZBRD_defconfig | 2 +- - arch/blackfin/configs/BF526-EZBRD_defconfig | 2 +- - arch/blackfin/configs/BF527-EZKIT-V2_defconfig | 2 +- - arch/blackfin/configs/BF527-EZKIT_defconfig | 2 +- - arch/blackfin/configs/BF527-TLL6527M_defconfig | 2 +- - arch/blackfin/configs/BF533-EZKIT_defconfig | 2 +- - arch/blackfin/configs/BF533-STAMP_defconfig | 2 +- - arch/blackfin/configs/BF537-STAMP_defconfig | 2 +- - arch/blackfin/configs/BF538-EZKIT_defconfig | 2 +- - arch/blackfin/configs/BF548-EZKIT_defconfig | 2 +- - arch/blackfin/configs/BF561-ACVILON_defconfig | 2 +- - arch/blackfin/configs/BF561-EZKIT-SMP_defconfig | 2 +- - arch/blackfin/configs/BF561-EZKIT_defconfig | 2 +- - arch/blackfin/configs/BF609-EZKIT_defconfig | 2 +- - arch/blackfin/configs/BlackStamp_defconfig | 2 +- - arch/blackfin/configs/CM-BF527_defconfig | 2 +- - arch/blackfin/configs/PNAV-10_defconfig | 2 +- - arch/blackfin/configs/SRV1_defconfig | 2 +- - arch/blackfin/configs/TCM-BF518_defconfig | 2 +- - arch/mips/configs/fuloong2e_defconfig | 3 ++- - arch/mips/configs/gpr_defconfig | 3 ++- - arch/mips/configs/ip22_defconfig | 3 ++- - arch/mips/configs/ip28_defconfig | 3 ++- - arch/mips/configs/jazz_defconfig | 3 ++- - arch/mips/configs/mtx1_defconfig | 3 ++- - arch/mips/configs/nlm_xlr_defconfig | 2 +- - arch/mips/configs/pic32mzda_defconfig | 2 +- - arch/mips/configs/pistachio_defconfig | 2 +- - arch/mips/configs/pnx8335_stb225_defconfig | 2 +- - arch/mips/configs/rm200_defconfig | 3 ++- - arch/parisc/configs/712_defconfig | 2 +- - arch/parisc/configs/c3000_defconfig | 2 +- - arch/parisc/configs/default_defconfig | 2 +- - arch/powerpc/configs/c2k_defconfig | 2 +- - arch/powerpc/configs/ppc6xx_defconfig | 2 +- - arch/score/configs/spct6600_defconfig | 2 +- - arch/sh/configs/se7712_defconfig | 2 +- - arch/sh/configs/se7721_defconfig | 2 +- - arch/sh/configs/titan_defconfig | 2 +- - arch/sparc/configs/sparc64_defconfig | 2 +- - arch/tile/configs/tilegx_defconfig | 2 +- - arch/tile/configs/tilepro_defconfig | 2 +- - arch/x86/configs/i386_defconfig | 2 +- - arch/x86/configs/x86_64_defconfig | 2 +- - kernel/Kconfig.preempt | 7 ++++--- - 50 files changed, 60 insertions(+), 52 deletions(-) - -diff --git a/arch/arc/configs/tb10x_defconfig b/arch/arc/configs/tb10x_defconfig -index f30182549395..42910f628869 100644 ---- a/arch/arc/configs/tb10x_defconfig -+++ b/arch/arc/configs/tb10x_defconfig -@@ -28,7 +28,7 @@ CONFIG_ARC_PLAT_TB10X=y - CONFIG_ARC_CACHE_LINE_SHIFT=5 - CONFIG_HZ=250 - CONFIG_ARC_BUILTIN_DTB_NAME="abilis_tb100_dvk" --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - # CONFIG_COMPACTION is not set - CONFIG_NET=y - CONFIG_PACKET=y -diff --git a/arch/arm/configs/bcm2835_defconfig b/arch/arm/configs/bcm2835_defconfig -index 43dab4890ad3..44a52166ca5e 100644 ---- a/arch/arm/configs/bcm2835_defconfig -+++ b/arch/arm/configs/bcm2835_defconfig -@@ -29,7 +29,7 @@ CONFIG_MODULE_UNLOAD=y - CONFIG_ARCH_MULTI_V6=y - CONFIG_ARCH_BCM=y - CONFIG_ARCH_BCM2835=y --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - CONFIG_AEABI=y - CONFIG_KSM=y - CONFIG_CLEANCACHE=y -diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig -index 32acac9ab81a..1482bb312987 100644 ---- a/arch/arm/configs/imx_v6_v7_defconfig -+++ b/arch/arm/configs/imx_v6_v7_defconfig -@@ -47,7 +47,7 @@ CONFIG_PCI_MSI=y - CONFIG_PCI_IMX6=y - CONFIG_SMP=y - CONFIG_ARM_PSCI=y --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - CONFIG_AEABI=y - CONFIG_HIGHMEM=y - CONFIG_CMA=y -diff --git a/arch/arm/configs/mps2_defconfig b/arch/arm/configs/mps2_defconfig -index 0bcdec7cc169..10ceaefa51e0 100644 ---- a/arch/arm/configs/mps2_defconfig -+++ b/arch/arm/configs/mps2_defconfig -@@ -18,7 +18,7 @@ CONFIG_ARCH_MPS2=y - CONFIG_SET_MEM_PARAM=y - CONFIG_DRAM_BASE=0x21000000 - CONFIG_DRAM_SIZE=0x1000000 --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - # CONFIG_ATAGS is not set - CONFIG_ZBOOT_ROM_TEXT=0x0 - CONFIG_ZBOOT_ROM_BSS=0x0 -diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig -index e5822ab01b7d..3e77e02f678f 100644 ---- a/arch/arm/configs/mxs_defconfig -+++ b/arch/arm/configs/mxs_defconfig -@@ -27,7 +27,7 @@ CONFIG_BLK_DEV_INTEGRITY=y - # CONFIG_ARCH_MULTI_V7 is not set - CONFIG_ARCH_MXS=y - # CONFIG_ARM_THUMB is not set --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - CONFIG_AEABI=y - CONFIG_NET=y - CONFIG_PACKET=y -diff --git a/arch/blackfin/configs/BF518F-EZBRD_defconfig b/arch/blackfin/configs/BF518F-EZBRD_defconfig -index 99c00d835f47..39b91dfa55b5 100644 ---- a/arch/blackfin/configs/BF518F-EZBRD_defconfig -+++ b/arch/blackfin/configs/BF518F-EZBRD_defconfig -@@ -19,7 +19,7 @@ CONFIG_MODULE_UNLOAD=y - # CONFIG_BLK_DEV_BSG is not set - # CONFIG_IOSCHED_DEADLINE is not set - # CONFIG_IOSCHED_CFQ is not set --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - CONFIG_BF518=y - CONFIG_IRQ_TIMER0=12 - # CONFIG_CYCLES_CLOCKSOURCE is not set -diff --git a/arch/blackfin/configs/BF526-EZBRD_defconfig b/arch/blackfin/configs/BF526-EZBRD_defconfig -index e66ba31ef84d..675cadb3a0c4 100644 ---- a/arch/blackfin/configs/BF526-EZBRD_defconfig -+++ b/arch/blackfin/configs/BF526-EZBRD_defconfig -@@ -19,7 +19,7 @@ CONFIG_MODULE_UNLOAD=y - # CONFIG_BLK_DEV_BSG is not set - # CONFIG_IOSCHED_DEADLINE is not set - # CONFIG_IOSCHED_CFQ is not set --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - CONFIG_BF526=y - CONFIG_IRQ_TIMER0=12 - CONFIG_BFIN526_EZBRD=y -diff --git a/arch/blackfin/configs/BF527-EZKIT-V2_defconfig b/arch/blackfin/configs/BF527-EZKIT-V2_defconfig -index 0207c588c19f..4c517c443af5 100644 ---- a/arch/blackfin/configs/BF527-EZKIT-V2_defconfig -+++ b/arch/blackfin/configs/BF527-EZKIT-V2_defconfig -@@ -19,7 +19,7 @@ CONFIG_MODULE_UNLOAD=y - # CONFIG_BLK_DEV_BSG is not set - # CONFIG_IOSCHED_DEADLINE is not set - # CONFIG_IOSCHED_CFQ is not set --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - CONFIG_BF527=y - CONFIG_BF_REV_0_2=y - CONFIG_BFIN527_EZKIT_V2=y -diff --git a/arch/blackfin/configs/BF527-EZKIT_defconfig b/arch/blackfin/configs/BF527-EZKIT_defconfig -index 99c131ba7d90..bf8df3e6cf02 100644 ---- a/arch/blackfin/configs/BF527-EZKIT_defconfig -+++ b/arch/blackfin/configs/BF527-EZKIT_defconfig -@@ -19,7 +19,7 @@ CONFIG_MODULE_UNLOAD=y - # CONFIG_BLK_DEV_BSG is not set - # CONFIG_IOSCHED_DEADLINE is not set - # CONFIG_IOSCHED_CFQ is not set --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - CONFIG_BF527=y - CONFIG_BF_REV_0_1=y - CONFIG_IRQ_USB_INT0=11 -diff --git a/arch/blackfin/configs/BF527-TLL6527M_defconfig b/arch/blackfin/configs/BF527-TLL6527M_defconfig -index cdeb51856f26..0220b3b15c53 100644 ---- a/arch/blackfin/configs/BF527-TLL6527M_defconfig -+++ b/arch/blackfin/configs/BF527-TLL6527M_defconfig -@@ -21,7 +21,7 @@ CONFIG_MODULE_UNLOAD=y - # CONFIG_LBDAF is not set - # CONFIG_BLK_DEV_BSG is not set - # CONFIG_IOSCHED_DEADLINE is not set --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - CONFIG_BF527=y - CONFIG_BF_REV_0_2=y - CONFIG_BFIN527_TLL6527M=y -diff --git a/arch/blackfin/configs/BF533-EZKIT_defconfig b/arch/blackfin/configs/BF533-EZKIT_defconfig -index ed7d2c096739..6023e3fd2c48 100644 ---- a/arch/blackfin/configs/BF533-EZKIT_defconfig -+++ b/arch/blackfin/configs/BF533-EZKIT_defconfig -@@ -19,7 +19,7 @@ CONFIG_MODULE_UNLOAD=y - # CONFIG_BLK_DEV_BSG is not set - # CONFIG_IOSCHED_DEADLINE is not set - # CONFIG_IOSCHED_CFQ is not set --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - CONFIG_BFIN533_EZKIT=y - CONFIG_TIMER0=11 - CONFIG_CLKIN_HZ=27000000 -diff --git a/arch/blackfin/configs/BF533-STAMP_defconfig b/arch/blackfin/configs/BF533-STAMP_defconfig -index 0c241f4d28d7..f5cd0f18b711 100644 ---- a/arch/blackfin/configs/BF533-STAMP_defconfig -+++ b/arch/blackfin/configs/BF533-STAMP_defconfig -@@ -19,7 +19,7 @@ CONFIG_MODULE_UNLOAD=y - # CONFIG_BLK_DEV_BSG is not set - # CONFIG_IOSCHED_DEADLINE is not set - # CONFIG_IOSCHED_CFQ is not set --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - CONFIG_TIMER0=11 - CONFIG_HIGH_RES_TIMERS=y - CONFIG_NOMMU_INITIAL_TRIM_EXCESS=0 -diff --git a/arch/blackfin/configs/BF537-STAMP_defconfig b/arch/blackfin/configs/BF537-STAMP_defconfig -index e5360b30e39a..48085fde7f9e 100644 ---- a/arch/blackfin/configs/BF537-STAMP_defconfig -+++ b/arch/blackfin/configs/BF537-STAMP_defconfig -@@ -19,7 +19,7 @@ CONFIG_MODULE_UNLOAD=y - # CONFIG_BLK_DEV_BSG is not set - # CONFIG_IOSCHED_DEADLINE is not set - # CONFIG_IOSCHED_CFQ is not set --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - CONFIG_BF537=y - CONFIG_HIGH_RES_TIMERS=y - CONFIG_NOMMU_INITIAL_TRIM_EXCESS=0 -diff --git a/arch/blackfin/configs/BF538-EZKIT_defconfig b/arch/blackfin/configs/BF538-EZKIT_defconfig -index 60f6fb86125c..12deeaaef3cb 100644 ---- a/arch/blackfin/configs/BF538-EZKIT_defconfig -+++ b/arch/blackfin/configs/BF538-EZKIT_defconfig -@@ -21,7 +21,7 @@ CONFIG_MODULE_UNLOAD=y - # CONFIG_BLK_DEV_BSG is not set - # CONFIG_IOSCHED_DEADLINE is not set - # CONFIG_IOSCHED_CFQ is not set --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - CONFIG_BF538=y - CONFIG_IRQ_TIMER0=12 - CONFIG_IRQ_TIMER1=12 -diff --git a/arch/blackfin/configs/BF548-EZKIT_defconfig b/arch/blackfin/configs/BF548-EZKIT_defconfig -index 38cb17d218d4..6a68ffc55b5a 100644 ---- a/arch/blackfin/configs/BF548-EZKIT_defconfig -+++ b/arch/blackfin/configs/BF548-EZKIT_defconfig -@@ -19,7 +19,7 @@ CONFIG_MODULE_UNLOAD=y - # CONFIG_BLK_DEV_BSG is not set - # CONFIG_IOSCHED_DEADLINE is not set - # CONFIG_IOSCHED_CFQ is not set --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - CONFIG_BF548_std=y - CONFIG_IRQ_TIMER0=11 - # CONFIG_CYCLES_CLOCKSOURCE is not set -diff --git a/arch/blackfin/configs/BF561-ACVILON_defconfig b/arch/blackfin/configs/BF561-ACVILON_defconfig -index 78f6bc79f910..e9f3ba783a4e 100644 ---- a/arch/blackfin/configs/BF561-ACVILON_defconfig -+++ b/arch/blackfin/configs/BF561-ACVILON_defconfig -@@ -20,7 +20,7 @@ CONFIG_MODULE_UNLOAD=y - # CONFIG_LBDAF is not set - # CONFIG_BLK_DEV_BSG is not set - # CONFIG_IOSCHED_DEADLINE is not set --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - CONFIG_BF561=y - CONFIG_BF_REV_0_5=y - CONFIG_IRQ_TIMER0=10 -diff --git a/arch/blackfin/configs/BF561-EZKIT-SMP_defconfig b/arch/blackfin/configs/BF561-EZKIT-SMP_defconfig -index fac8bb578249..89b75a6c3fab 100644 ---- a/arch/blackfin/configs/BF561-EZKIT-SMP_defconfig -+++ b/arch/blackfin/configs/BF561-EZKIT-SMP_defconfig -@@ -19,7 +19,7 @@ CONFIG_MODULE_UNLOAD=y - # CONFIG_BLK_DEV_BSG is not set - # CONFIG_IOSCHED_DEADLINE is not set - # CONFIG_IOSCHED_CFQ is not set --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - CONFIG_BF561=y - CONFIG_SMP=y - CONFIG_IRQ_TIMER0=10 -diff --git a/arch/blackfin/configs/BF561-EZKIT_defconfig b/arch/blackfin/configs/BF561-EZKIT_defconfig -index 2a2e4d0cebc1..67b3d2f419ba 100644 ---- a/arch/blackfin/configs/BF561-EZKIT_defconfig -+++ b/arch/blackfin/configs/BF561-EZKIT_defconfig -@@ -19,7 +19,7 @@ CONFIG_MODULE_UNLOAD=y - # CONFIG_BLK_DEV_BSG is not set - # CONFIG_IOSCHED_DEADLINE is not set - # CONFIG_IOSCHED_CFQ is not set --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - CONFIG_BF561=y - CONFIG_IRQ_TIMER0=10 - CONFIG_CLKIN_HZ=30000000 -diff --git a/arch/blackfin/configs/BF609-EZKIT_defconfig b/arch/blackfin/configs/BF609-EZKIT_defconfig -index 3ce77f07208a..8cc75d4218fb 100644 ---- a/arch/blackfin/configs/BF609-EZKIT_defconfig -+++ b/arch/blackfin/configs/BF609-EZKIT_defconfig -@@ -20,7 +20,7 @@ CONFIG_MODULE_UNLOAD=y - # CONFIG_BLK_DEV_BSG is not set - # CONFIG_IOSCHED_DEADLINE is not set - # CONFIG_IOSCHED_CFQ is not set --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - CONFIG_BF609=y - CONFIG_PINT1_ASSIGN=0x01010000 - CONFIG_PINT2_ASSIGN=0x07000101 -diff --git a/arch/blackfin/configs/BlackStamp_defconfig b/arch/blackfin/configs/BlackStamp_defconfig -index f4a9200e1ab1..9faf0ec7007f 100644 ---- a/arch/blackfin/configs/BlackStamp_defconfig -+++ b/arch/blackfin/configs/BlackStamp_defconfig -@@ -17,7 +17,7 @@ CONFIG_MODULE_UNLOAD=y - CONFIG_MODULE_FORCE_UNLOAD=y - # CONFIG_BLK_DEV_BSG is not set - # CONFIG_IOSCHED_DEADLINE is not set --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - CONFIG_BF532=y - CONFIG_BF_REV_0_5=y - CONFIG_BLACKSTAMP=y -diff --git a/arch/blackfin/configs/CM-BF527_defconfig b/arch/blackfin/configs/CM-BF527_defconfig -index 1902bb05d086..4a1ad4fd7bb2 100644 ---- a/arch/blackfin/configs/CM-BF527_defconfig -+++ b/arch/blackfin/configs/CM-BF527_defconfig -@@ -19,7 +19,7 @@ CONFIG_MODULES=y - CONFIG_MODULE_UNLOAD=y - # CONFIG_BLK_DEV_BSG is not set - # CONFIG_IOSCHED_DEADLINE is not set --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - CONFIG_BF527=y - CONFIG_BF_REV_0_1=y - CONFIG_IRQ_TIMER0=12 -diff --git a/arch/blackfin/configs/PNAV-10_defconfig b/arch/blackfin/configs/PNAV-10_defconfig -index c7926812971c..9d787e28bbe8 100644 ---- a/arch/blackfin/configs/PNAV-10_defconfig -+++ b/arch/blackfin/configs/PNAV-10_defconfig -@@ -15,7 +15,7 @@ CONFIG_MODULE_UNLOAD=y - # CONFIG_BLK_DEV_BSG is not set - # CONFIG_IOSCHED_DEADLINE is not set - # CONFIG_IOSCHED_CFQ is not set --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - CONFIG_BF537=y - CONFIG_IRQ_TIMER0=12 - CONFIG_PNAV10=y -diff --git a/arch/blackfin/configs/SRV1_defconfig b/arch/blackfin/configs/SRV1_defconfig -index 23fdc57d657a..225df32dc9a8 100644 ---- a/arch/blackfin/configs/SRV1_defconfig -+++ b/arch/blackfin/configs/SRV1_defconfig -@@ -13,7 +13,7 @@ CONFIG_MMAP_ALLOW_UNINITIALIZED=y - CONFIG_MODULES=y - CONFIG_MODULE_UNLOAD=y - # CONFIG_IOSCHED_DEADLINE is not set --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - CONFIG_BF537=y - CONFIG_IRQ_TIMER0=12 - CONFIG_BOOT_LOAD=0x400000 -diff --git a/arch/blackfin/configs/TCM-BF518_defconfig b/arch/blackfin/configs/TCM-BF518_defconfig -index e28959479fe0..425c24e43c34 100644 ---- a/arch/blackfin/configs/TCM-BF518_defconfig -+++ b/arch/blackfin/configs/TCM-BF518_defconfig -@@ -23,7 +23,7 @@ CONFIG_MODULE_UNLOAD=y - # CONFIG_BLK_DEV_BSG is not set - # CONFIG_IOSCHED_DEADLINE is not set - # CONFIG_IOSCHED_CFQ is not set --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - CONFIG_BF518=y - CONFIG_BF_REV_0_1=y - CONFIG_BFIN518F_TCM=y -diff --git a/arch/mips/configs/fuloong2e_defconfig b/arch/mips/configs/fuloong2e_defconfig -index 499f51498ecb..f7cb39b0662c 100644 ---- a/arch/mips/configs/fuloong2e_defconfig -+++ b/arch/mips/configs/fuloong2e_defconfig -@@ -2,7 +2,8 @@ CONFIG_MACH_LOONGSON64=y - CONFIG_64BIT=y - CONFIG_NO_HZ=y - CONFIG_HIGH_RES_TIMERS=y --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y -+CONFIG_EXPERIMENTAL=y - CONFIG_LOCALVERSION="-fuloong2e" - # CONFIG_LOCALVERSION_AUTO is not set - CONFIG_SYSVIPC=y -diff --git a/arch/mips/configs/gpr_defconfig b/arch/mips/configs/gpr_defconfig -index 55438fc9991e..db03ef4f737d 100644 ---- a/arch/mips/configs/gpr_defconfig -+++ b/arch/mips/configs/gpr_defconfig -@@ -1,7 +1,8 @@ - CONFIG_MIPS_ALCHEMY=y - CONFIG_MIPS_GPR=y - CONFIG_HIGH_RES_TIMERS=y --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y -+CONFIG_EXPERIMENTAL=y - # CONFIG_LOCALVERSION_AUTO is not set - CONFIG_SYSVIPC=y - CONFIG_POSIX_MQUEUE=y -diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig -index 83e8fe2064aa..93e7b167433b 100644 ---- a/arch/mips/configs/ip22_defconfig -+++ b/arch/mips/configs/ip22_defconfig -@@ -3,7 +3,8 @@ CONFIG_CPU_R5000=y - CONFIG_NO_HZ=y - CONFIG_HIGH_RES_TIMERS=y - CONFIG_HZ_1000=y --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y -+CONFIG_EXPERIMENTAL=y - CONFIG_SYSVIPC=y - CONFIG_IKCONFIG=y - CONFIG_IKCONFIG_PROC=y -diff --git a/arch/mips/configs/ip28_defconfig b/arch/mips/configs/ip28_defconfig -index d0a4c2cfacf8..6f0600e99c25 100644 ---- a/arch/mips/configs/ip28_defconfig -+++ b/arch/mips/configs/ip28_defconfig -@@ -1,6 +1,7 @@ - CONFIG_SGI_IP28=y - CONFIG_ARC_CONSOLE=y --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y -+CONFIG_EXPERIMENTAL=y - CONFIG_SYSVIPC=y - CONFIG_IKCONFIG=y - CONFIG_IKCONFIG_PROC=y -diff --git a/arch/mips/configs/jazz_defconfig b/arch/mips/configs/jazz_defconfig -index 9ad1c94376c8..1d62ce7ff5dc 100644 ---- a/arch/mips/configs/jazz_defconfig -+++ b/arch/mips/configs/jazz_defconfig -@@ -1,6 +1,7 @@ - CONFIG_MACH_JAZZ=y - CONFIG_OLIVETTI_M700=y --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y -+CONFIG_EXPERIMENTAL=y - CONFIG_SYSVIPC=y - CONFIG_POSIX_MQUEUE=y - CONFIG_BSD_PROCESS_ACCT=y -diff --git a/arch/mips/configs/mtx1_defconfig b/arch/mips/configs/mtx1_defconfig -index c3d0d0a6e044..aa3426d5f7d7 100644 ---- a/arch/mips/configs/mtx1_defconfig -+++ b/arch/mips/configs/mtx1_defconfig -@@ -1,6 +1,7 @@ - CONFIG_MIPS_ALCHEMY=y - CONFIG_MIPS_MTX1=y --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y -+CONFIG_EXPERIMENTAL=y - # CONFIG_LOCALVERSION_AUTO is not set - CONFIG_SYSVIPC=y - CONFIG_POSIX_MQUEUE=y -diff --git a/arch/mips/configs/nlm_xlr_defconfig b/arch/mips/configs/nlm_xlr_defconfig -index 1e18fd7de209..b514e91e5426 100644 ---- a/arch/mips/configs/nlm_xlr_defconfig -+++ b/arch/mips/configs/nlm_xlr_defconfig -@@ -5,7 +5,7 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 - CONFIG_SMP=y - CONFIG_NO_HZ=y - CONFIG_HIGH_RES_TIMERS=y --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - CONFIG_KEXEC=y - CONFIG_CROSS_COMPILE="" - # CONFIG_LOCALVERSION_AUTO is not set -diff --git a/arch/mips/configs/pic32mzda_defconfig b/arch/mips/configs/pic32mzda_defconfig -index 52192c632ae8..96b087498dab 100644 ---- a/arch/mips/configs/pic32mzda_defconfig -+++ b/arch/mips/configs/pic32mzda_defconfig -@@ -1,7 +1,7 @@ - CONFIG_MACH_PIC32=y - CONFIG_DTB_PIC32_MZDA_SK=y - CONFIG_HZ_100=y --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - # CONFIG_SECCOMP is not set - CONFIG_SYSVIPC=y - CONFIG_NO_HZ=y -diff --git a/arch/mips/configs/pistachio_defconfig b/arch/mips/configs/pistachio_defconfig -index b22a3cf149b6..cfffca3d37f4 100644 ---- a/arch/mips/configs/pistachio_defconfig -+++ b/arch/mips/configs/pistachio_defconfig -@@ -5,7 +5,7 @@ CONFIG_MIPS_CPS=y - CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 - CONFIG_ZSMALLOC=y - CONFIG_NR_CPUS=4 --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - # CONFIG_LOCALVERSION_AUTO is not set - CONFIG_DEFAULT_HOSTNAME="localhost" - CONFIG_SYSVIPC=y -diff --git a/arch/mips/configs/pnx8335_stb225_defconfig b/arch/mips/configs/pnx8335_stb225_defconfig -index 81b5eb89446c..19f8cea849a1 100644 ---- a/arch/mips/configs/pnx8335_stb225_defconfig -+++ b/arch/mips/configs/pnx8335_stb225_defconfig -@@ -3,7 +3,7 @@ CONFIG_CPU_LITTLE_ENDIAN=y - CONFIG_NO_HZ=y - CONFIG_HIGH_RES_TIMERS=y - CONFIG_HZ_128=y --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - # CONFIG_SECCOMP is not set - # CONFIG_LOCALVERSION_AUTO is not set - # CONFIG_SWAP is not set -diff --git a/arch/mips/configs/rm200_defconfig b/arch/mips/configs/rm200_defconfig -index 99679e514042..2ced507a8ba7 100644 ---- a/arch/mips/configs/rm200_defconfig -+++ b/arch/mips/configs/rm200_defconfig -@@ -2,7 +2,8 @@ CONFIG_SNI_RM=y - CONFIG_CPU_LITTLE_ENDIAN=y - CONFIG_ARC_CONSOLE=y - CONFIG_HZ_1000=y --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y -+CONFIG_EXPERIMENTAL=y - CONFIG_SYSVIPC=y - CONFIG_POSIX_MQUEUE=y - CONFIG_BSD_PROCESS_ACCT=y -diff --git a/arch/parisc/configs/712_defconfig b/arch/parisc/configs/712_defconfig -index ccc109761f44..a6a5b0b7a9c9 100644 ---- a/arch/parisc/configs/712_defconfig -+++ b/arch/parisc/configs/712_defconfig -@@ -13,7 +13,7 @@ CONFIG_MODULES=y - CONFIG_MODULE_UNLOAD=y - CONFIG_MODULE_FORCE_UNLOAD=y - CONFIG_PA7100LC=y --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - CONFIG_GSC_LASI=y - # CONFIG_PDC_CHASSIS is not set - CONFIG_BINFMT_MISC=m -diff --git a/arch/parisc/configs/c3000_defconfig b/arch/parisc/configs/c3000_defconfig -index 8d41a73bd71b..b8e0a6662ff9 100644 ---- a/arch/parisc/configs/c3000_defconfig -+++ b/arch/parisc/configs/c3000_defconfig -@@ -13,7 +13,7 @@ CONFIG_MODULES=y - CONFIG_MODULE_UNLOAD=y - CONFIG_MODULE_FORCE_UNLOAD=y - CONFIG_PA8X00=y --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - # CONFIG_GSC is not set - CONFIG_PCI=y - CONFIG_PCI_LBA=y -diff --git a/arch/parisc/configs/default_defconfig b/arch/parisc/configs/default_defconfig -index 52c9050a7c5c..8d86d2e989f4 100644 ---- a/arch/parisc/configs/default_defconfig -+++ b/arch/parisc/configs/default_defconfig -@@ -14,7 +14,7 @@ CONFIG_MODULE_UNLOAD=y - CONFIG_MODULE_FORCE_UNLOAD=y - # CONFIG_BLK_DEV_BSG is not set - CONFIG_PA7100LC=y --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - CONFIG_IOMMU_CCIO=y - CONFIG_GSC_LASI=y - CONFIG_GSC_WAX=y -diff --git a/arch/powerpc/configs/c2k_defconfig b/arch/powerpc/configs/c2k_defconfig -index f1552af9eecc..f8505e6ec7b3 100644 ---- a/arch/powerpc/configs/c2k_defconfig -+++ b/arch/powerpc/configs/c2k_defconfig -@@ -29,7 +29,7 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=m - CONFIG_CPU_FREQ_GOV_ONDEMAND=m - CONFIG_GEN_RTC=y - CONFIG_HIGHMEM=y --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - CONFIG_BINFMT_MISC=y - CONFIG_PM=y - CONFIG_PCI_MSI=y -diff --git a/arch/powerpc/configs/ppc6xx_defconfig b/arch/powerpc/configs/ppc6xx_defconfig -index da0e8d535eb8..c016af41ab4f 100644 ---- a/arch/powerpc/configs/ppc6xx_defconfig -+++ b/arch/powerpc/configs/ppc6xx_defconfig -@@ -74,7 +74,7 @@ CONFIG_QE_GPIO=y - CONFIG_MCU_MPC8349EMITX=y - CONFIG_HIGHMEM=y - CONFIG_HZ_1000=y --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - CONFIG_BINFMT_MISC=y - CONFIG_HIBERNATION=y - CONFIG_PM_DEBUG=y -diff --git a/arch/score/configs/spct6600_defconfig b/arch/score/configs/spct6600_defconfig -index b2d8802f43b4..46434ca1fa10 100644 ---- a/arch/score/configs/spct6600_defconfig -+++ b/arch/score/configs/spct6600_defconfig -@@ -1,5 +1,5 @@ - CONFIG_HZ_100=y --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - CONFIG_EXPERIMENTAL=y - # CONFIG_LOCALVERSION_AUTO is not set - CONFIG_SYSVIPC=y -diff --git a/arch/sh/configs/se7712_defconfig b/arch/sh/configs/se7712_defconfig -index 5a1097641247..eb5fbf554e7f 100644 ---- a/arch/sh/configs/se7712_defconfig -+++ b/arch/sh/configs/se7712_defconfig -@@ -23,7 +23,7 @@ CONFIG_FLATMEM_MANUAL=y - CONFIG_SH_SOLUTION_ENGINE=y - CONFIG_SH_PCLK_FREQ=66666666 - CONFIG_HEARTBEAT=y --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - CONFIG_CMDLINE_OVERWRITE=y - CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/sda1" - CONFIG_NET=y -diff --git a/arch/sh/configs/se7721_defconfig b/arch/sh/configs/se7721_defconfig -index 9c0ef13bee10..cbaa65c8bf9e 100644 ---- a/arch/sh/configs/se7721_defconfig -+++ b/arch/sh/configs/se7721_defconfig -@@ -23,7 +23,7 @@ CONFIG_FLATMEM_MANUAL=y - CONFIG_SH_7721_SOLUTION_ENGINE=y - CONFIG_SH_PCLK_FREQ=33333333 - CONFIG_HEARTBEAT=y --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - CONFIG_CMDLINE_OVERWRITE=y - CONFIG_CMDLINE="console=ttySC0,115200 root=/dev/sda2" - CONFIG_NET=y -diff --git a/arch/sh/configs/titan_defconfig b/arch/sh/configs/titan_defconfig -index ceb48e9b70f4..1a69eda6610c 100644 ---- a/arch/sh/configs/titan_defconfig -+++ b/arch/sh/configs/titan_defconfig -@@ -20,7 +20,7 @@ CONFIG_SH_TITAN=y - CONFIG_SH_PCLK_FREQ=30000000 - CONFIG_SH_DMA=y - CONFIG_SH_DMA_API=y --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - CONFIG_CMDLINE_OVERWRITE=y - CONFIG_CMDLINE="console=ttySC1,38400N81 root=/dev/nfs ip=:::::eth1:autoconf rw" - CONFIG_PCI=y -diff --git a/arch/sparc/configs/sparc64_defconfig b/arch/sparc/configs/sparc64_defconfig -index 4d4e1cc6402f..04bea1d28ba7 100644 ---- a/arch/sparc/configs/sparc64_defconfig -+++ b/arch/sparc/configs/sparc64_defconfig -@@ -22,7 +22,7 @@ CONFIG_NO_HZ=y - CONFIG_HIGH_RES_TIMERS=y - CONFIG_NUMA=y - CONFIG_DEFAULT_MMAP_MIN_ADDR=8192 --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - CONFIG_SUN_LDOMS=y - CONFIG_PCI=y - CONFIG_PCI_MSI=y -diff --git a/arch/tile/configs/tilegx_defconfig b/arch/tile/configs/tilegx_defconfig -index 9f94435cc44f..aa78ee6cd5eb 100644 ---- a/arch/tile/configs/tilegx_defconfig -+++ b/arch/tile/configs/tilegx_defconfig -@@ -47,7 +47,7 @@ CONFIG_CFQ_GROUP_IOSCHED=y - CONFIG_NR_CPUS=100 - CONFIG_HZ_100=y - # CONFIG_COMPACTION is not set --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - CONFIG_TILE_PCI_IO=y - CONFIG_PCI_DEBUG=y - # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -diff --git a/arch/tile/configs/tilepro_defconfig b/arch/tile/configs/tilepro_defconfig -index 1c5bd4f8ffca..38005862062c 100644 ---- a/arch/tile/configs/tilepro_defconfig -+++ b/arch/tile/configs/tilepro_defconfig -@@ -44,7 +44,7 @@ CONFIG_KARMA_PARTITION=y - CONFIG_CFQ_GROUP_IOSCHED=y - CONFIG_HZ_100=y - # CONFIG_COMPACTION is not set --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - CONFIG_PCI_DEBUG=y - # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set - CONFIG_BINFMT_MISC=y -diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig -index 0eb9f92f3717..e5890ae917e5 100644 ---- a/arch/x86/configs/i386_defconfig -+++ b/arch/x86/configs/i386_defconfig -@@ -41,7 +41,7 @@ CONFIG_SMP=y - CONFIG_X86_GENERIC=y - CONFIG_HPET_TIMER=y - CONFIG_SCHED_SMT=y --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y - CONFIG_X86_MCE=y - CONFIG_X86_REBOOTFIXUPS=y -diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig -index 4a4b16e56d35..7452dcadda74 100644 ---- a/arch/x86/configs/x86_64_defconfig -+++ b/arch/x86/configs/x86_64_defconfig -@@ -40,7 +40,7 @@ CONFIG_SMP=y - CONFIG_CALGARY_IOMMU=y - CONFIG_NR_CPUS=64 - CONFIG_SCHED_SMT=y --CONFIG_PREEMPT_VOLUNTARY=y -+CONFIG_PREEMPT=y - CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y - CONFIG_X86_MCE=y - CONFIG_MICROCODE=y -diff --git a/kernel/Kconfig.preempt b/kernel/Kconfig.preempt -index 3f9c97419f02..1dc79ec7ad09 100644 ---- a/kernel/Kconfig.preempt -+++ b/kernel/Kconfig.preempt -@@ -1,7 +1,7 @@ - - choice - prompt "Preemption Model" -- default PREEMPT_NONE -+ default PREEMPT - - config PREEMPT_NONE - bool "No Forced Preemption (Server)" -@@ -17,7 +17,7 @@ config PREEMPT_NONE - latencies. - - config PREEMPT_VOLUNTARY -- bool "Voluntary Kernel Preemption (Desktop)" -+ bool "Voluntary Kernel Preemption (Nothing)" - help - This option reduces the latency of the kernel by adding more - "explicit preemption points" to the kernel code. These new -@@ -31,7 +31,8 @@ config PREEMPT_VOLUNTARY - applications to run more 'smoothly' even when the system is - under load. - -- Select this if you are building a kernel for a desktop system. -+ Select this for no system in particular (choose Preemptible -+ instead on a desktop if you know what's good for you). - - config PREEMPT - bool "Preemptible Kernel (Low-Latency Desktop)" --- -2.11.0 - |