diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-11-08 04:17:15 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-11-08 04:17:15 -0500 |
| commit | 8a103df440afea30c91ebd42e61dc644e647f4bd (patch) | |
| tree | 2cfa99e9c6e1e138e1404bce4294e46cb0034cce /include/linux/srcu.h | |
| parent | a9903f04e0a4ea522d959c2f287cdf0ab029e324 (diff) | |
| parent | fbc3edf7d7731d7a22c483c679700589bab936a3 (diff) | |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/srcu.h')
| -rw-r--r-- | include/linux/srcu.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/srcu.h b/include/linux/srcu.h index 39af9bc0f653..62be8966e837 100644 --- a/include/linux/srcu.h +++ b/include/linux/srcu.h | |||
| @@ -78,6 +78,7 @@ void synchronize_srcu(struct srcu_struct *sp); | |||
| 78 | 78 | ||
| 79 | /** | 79 | /** |
| 80 | * srcu_read_lock_held - might we be in SRCU read-side critical section? | 80 | * srcu_read_lock_held - might we be in SRCU read-side critical section? |
| 81 | * @sp: The srcu_struct structure to check | ||
| 81 | * | 82 | * |
| 82 | * If CONFIG_DEBUG_LOCK_ALLOC is selected, returns nonzero iff in an SRCU | 83 | * If CONFIG_DEBUG_LOCK_ALLOC is selected, returns nonzero iff in an SRCU |
| 83 | * read-side critical section. In absence of CONFIG_DEBUG_LOCK_ALLOC, | 84 | * read-side critical section. In absence of CONFIG_DEBUG_LOCK_ALLOC, |