diff options
Diffstat (limited to 'lib/scatterlist.c')
| -rw-r--r-- | lib/scatterlist.c | 11 | 
1 files changed, 4 insertions, 7 deletions
diff --git a/lib/scatterlist.c b/lib/scatterlist.c index abb3432ed744..d5e82e4a57ad 100644 --- a/lib/scatterlist.c +++ b/lib/scatterlist.c @@ -828,8 +828,7 @@ static bool sg_miter_get_next_page(struct sg_mapping_iter *miter)   *   stops @miter.   *   * Context: - *   Don't care if @miter is stopped, or not proceeded yet. - *   Otherwise, preemption disabled if the SG_MITER_ATOMIC is set. + *   Don't care.   *   * Returns:   *   true if @miter contains the valid mapping.  false if end of sg @@ -865,8 +864,7 @@ EXPORT_SYMBOL(sg_miter_skip);   *   @miter->addr and @miter->length point to the current mapping.   *   * Context: - *   Preemption disabled if SG_MITER_ATOMIC.  Preemption must stay disabled - *   till @miter is stopped.  May sleep if !SG_MITER_ATOMIC. + *   May sleep if !SG_MITER_ATOMIC.   *   * Returns:   *   true if @miter contains the next mapping.  false if end of sg @@ -906,8 +904,7 @@ EXPORT_SYMBOL(sg_miter_next);   *   need to be released during iteration.   *   * Context: - *   Preemption disabled if the SG_MITER_ATOMIC is set.  Don't care - *   otherwise. + *   Don't care otherwise.   */  void sg_miter_stop(struct sg_mapping_iter *miter)  { @@ -922,7 +919,7 @@ void sg_miter_stop(struct sg_mapping_iter *miter)  			flush_dcache_page(miter->page);  		if (miter->__flags & SG_MITER_ATOMIC) { -			WARN_ON_ONCE(preemptible()); +			WARN_ON_ONCE(!pagefault_disabled());  			kunmap_atomic(miter->addr);  		} else  			kunmap(miter->page);  |