diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-02-09 06:03:15 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-02-09 06:03:15 -0500 |
| commit | 3aa6b46c6d6d0f89395ec3811a77fe22e57fa0d3 (patch) | |
| tree | 12f0563b9b4915ad1b43488df21709dfac287f37 /lib | |
| parent | 975db45e9cc561bf8a7eddfa0705d3a078ec184f (diff) | |
| parent | 8a5fd56431fe1682e870bd6ab0c276e74befbeb9 (diff) | |
Merge branch 'locking/urgent' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/scatterlist.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/scatterlist.c b/lib/scatterlist.c index bafa9933fa76..004fc70fc56a 100644 --- a/lib/scatterlist.c +++ b/lib/scatterlist.c | |||
| @@ -598,9 +598,9 @@ EXPORT_SYMBOL(sg_miter_next); | |||
| 598 | * | 598 | * |
| 599 | * Description: | 599 | * Description: |
| 600 | * Stops mapping iterator @miter. @miter should have been started | 600 | * Stops mapping iterator @miter. @miter should have been started |
| 601 | * started using sg_miter_start(). A stopped iteration can be | 601 | * using sg_miter_start(). A stopped iteration can be resumed by |
| 602 | * resumed by calling sg_miter_next() on it. This is useful when | 602 | * calling sg_miter_next() on it. This is useful when resources (kmap) |
| 603 | * resources (kmap) need to be released during iteration. | 603 | * need to be released during iteration. |
| 604 | * | 604 | * |
| 605 | * Context: | 605 | * Context: |
| 606 | * Preemption disabled if the SG_MITER_ATOMIC is set. Don't care | 606 | * Preemption disabled if the SG_MITER_ATOMIC is set. Don't care |