History

Merge branches 'doc.2015.01.07a', 'fixes.2015.01.15a', 'preempt.2015.01.06a', 'srcu.2015.01.06a', 'stall.2015.01.16a' and 'torture.2015.01.11a' into HEAD

doc.2015.01.07a: Documentation updates. fixes.2015.01.15a: Miscellaneous fixes. preempt.2015.01.06a: Changes to handling of lists of preempted tasks. srcu.2015.01.06a: SRCU updates. stall.2015.01.16a: RCU CPU stall-warning updates and fixes. torture.2015.01.11a: RCU torture-test updates and fixes.

Paul E. McKenney committed 11 years ago

Commit 78e691f6 parents d87510c 6047967 ab954c1 83fe27e 630181c 7602de447 files · +562 −567Browse files

Showing the changes to init (1 of 47 files). Show all

Unified · Split

init/Kconfig+13−5
@@ -470,7 +470,6 @@ choice · 469 unmodified lines
470470 config TREE_RCU
471471 bool "Tree-based hierarchical RCU"
472472 depends on !PREEMPT && SMP
473− select IRQ_WORK
474473 help
475474 This option selects the RCU implementation that is
476475 designed for very large SMP system with hundreds or
@@ -480,7 +479,6 @@ config TREE_RCU · 3 unmodified lines
480479 config PREEMPT_RCU
481480 bool "Preemptible tree-based hierarchical RCU"
482481 depends on PREEMPT
483− select IRQ_WORK
484482 help
485483 This option selects the RCU implementation that is
486484 designed for very large SMP systems with hundreds or
@@ -501,9 +499,17 @@ config TINY_RCU · 14 unmodified lines
501499
502500 endchoice
503501
502+config SRCU
503+ bool
504+ help
505+ This option selects the sleepable version of RCU. This version
506+ permits arbitrary sleeping or blocking within RCU read-side critical
507+ sections.
508+
504509 config TASKS_RCU
505510 bool "Task_based RCU implementation using voluntary context switch"
506511 default n
512+ select SRCU
507513 help
508514 This option enables a task-based RCU implementation that uses
509515 only voluntary context switch (not preemption!), idle, and
@@ -668,9 +674,10 @@ config RCU_BOOST · 158 unmodified lines
668674
669675 config RCU_KTHREAD_PRIO
670676 int "Real-time priority to use for RCU worker threads"
671− range 1 99
672− depends on RCU_BOOST
673− default 1
677+ range 1 99 if RCU_BOOST
678+ range 0 99 if !RCU_BOOST
679+ default 1 if RCU_BOOST
680+ default 0 if !RCU_BOOST
674681 help
675682 This option specifies the SCHED_FIFO priority value that will be
676683 assigned to the rcuc/n and rcub/n threads and is also the value
@@ -1595,6 +1602,7 @@ config PERF_EVENTS · 918 unmodified lines
15951602 depends on HAVE_PERF_EVENTS
15961603 select ANON_INODES
15971604 select IRQ_WORK
1605+ select SRCU
15981606 help
15991607 Enable kernel support for various performance events provided
16001608 by software and hardware.

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t