Skip to content

Commit 853eff4

Browse files
committed
config: Switch CONFIG_PREEMPT to CONFIG_PREEMPT_VOLUNTARY
See discussion here: #1216
1 parent d33d029 commit 853eff4

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

arch/arm/configs/bcm2709_defconfig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ CONFIG_BCM2709_DT=y
4444
CONFIG_SMP=y
4545
CONFIG_HAVE_ARM_ARCH_TIMER=y
4646
CONFIG_VMSPLIT_2G=y
47-
CONFIG_PREEMPT=y
47+
CONFIG_PREEMPT_VOLUNTARY=y
4848
CONFIG_AEABI=y
4949
CONFIG_OABI_COMPAT=y
5050
CONFIG_CLEANCACHE=y
@@ -1230,7 +1230,6 @@ CONFIG_BOOT_PRINTK_DELAY=y
12301230
CONFIG_DEBUG_MEMORY_INIT=y
12311231
CONFIG_DETECT_HUNG_TASK=y
12321232
CONFIG_TIMER_STATS=y
1233-
# CONFIG_DEBUG_PREEMPT is not set
12341233
CONFIG_IRQSOFF_TRACER=y
12351234
CONFIG_SCHED_TRACER=y
12361235
CONFIG_STACK_TRACER=y

arch/arm/configs/bcmrpi_defconfig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ CONFIG_MAC_PARTITION=y
3939
CONFIG_CFQ_GROUP_IOSCHED=y
4040
CONFIG_ARCH_BCM2708=y
4141
CONFIG_BCM2708_DT=y
42-
CONFIG_PREEMPT=y
42+
CONFIG_PREEMPT_VOLUNTARY=y
4343
CONFIG_AEABI=y
4444
CONFIG_OABI_COMPAT=y
4545
CONFIG_CLEANCACHE=y
@@ -1223,7 +1223,6 @@ CONFIG_BOOT_PRINTK_DELAY=y
12231223
CONFIG_DEBUG_MEMORY_INIT=y
12241224
CONFIG_DETECT_HUNG_TASK=y
12251225
CONFIG_TIMER_STATS=y
1226-
# CONFIG_DEBUG_PREEMPT is not set
12271226
CONFIG_LATENCYTOP=y
12281227
CONFIG_IRQSOFF_TRACER=y
12291228
CONFIG_SCHED_TRACER=y

0 commit comments

Comments
 (0)