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
470config TREE_RCU470config TREE_RCU
471 bool "Tree-based hierarchical RCU"471 bool "Tree-based hierarchical RCU"
472 depends on !PREEMPT && SMP472 depends on !PREEMPT && SMP
473 select IRQ_WORK
474 help473 help
475 This option selects the RCU implementation that is474 This option selects the RCU implementation that is
476 designed for very large SMP system with hundreds or475 designed for very large SMP system with hundreds or
@@ -480,7 +479,6 @@ config TREE_RCU · 3 unmodified lines
480config PREEMPT_RCU479config PREEMPT_RCU
481 bool "Preemptible tree-based hierarchical RCU"480 bool "Preemptible tree-based hierarchical RCU"
482 depends on PREEMPT481 depends on PREEMPT
483 select IRQ_WORK
484 help482 help
485 This option selects the RCU implementation that is483 This option selects the RCU implementation that is
486 designed for very large SMP systems with hundreds or484 designed for very large SMP systems with hundreds or
@@ -501,9 +499,17 @@ config TINY_RCU · 14 unmodified lines
501 499
502endchoice500endchoice
503 501
502config 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
504config TASKS_RCU509config TASKS_RCU
505 bool "Task_based RCU implementation using voluntary context switch"510 bool "Task_based RCU implementation using voluntary context switch"
506 default n511 default n
512 select SRCU
507 help513 help
508 This option enables a task-based RCU implementation that uses514 This option enables a task-based RCU implementation that uses
509 only voluntary context switch (not preemption!), idle, and515 only voluntary context switch (not preemption!), idle, and
@@ -668,9 +674,10 @@ config RCU_BOOST · 158 unmodified lines
668 674
669config RCU_KTHREAD_PRIO675config RCU_KTHREAD_PRIO
670 int "Real-time priority to use for RCU worker threads"676 int "Real-time priority to use for RCU worker threads"
671 range 1 99677 range 1 99 if RCU_BOOST
672 depends on RCU_BOOST678 range 0 99 if !RCU_BOOST
673 default 1679 default 1 if RCU_BOOST
680 default 0 if !RCU_BOOST
674 help681 help
675 This option specifies the SCHED_FIFO priority value that will be682 This option specifies the SCHED_FIFO priority value that will be
676 assigned to the rcuc/n and rcub/n threads and is also the value683 assigned to the rcuc/n and rcub/n threads and is also the value
@@ -1595,6 +1602,7 @@ config PERF_EVENTS · 918 unmodified lines
1595 depends on HAVE_PERF_EVENTS1602 depends on HAVE_PERF_EVENTS
1596 select ANON_INODES1603 select ANON_INODES
1597 select IRQ_WORK1604 select IRQ_WORK
1605 select SRCU
1598 help1606 help
1599 Enable kernel support for various performance events provided1607 Enable kernel support for various performance events provided
1600 by software and hardware.1608 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