---

yaml --- r: 317779 b: refs/heads/master c: 166cfda h: refs/heads/master i: 317777: faada96 317775: 96b0a27 v: v3
git-mirror · Jul 9, 2012 · d7060d5 · d7060d5
1 parent ee08646
commit d7060d5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 103123305c4f695cbb11555d51a32ea14d6bed05
+refs/heads/master: 166cfda752ca22eb6912614993b85f9a997dbd8f
diff --git a/trunk/drivers/staging/zsmalloc/zsmalloc-main.c b/trunk/drivers/staging/zsmalloc/zsmalloc-main.c
@@ -747,7 +747,12 @@ EXPORT_SYMBOL_GPL(zs_free);
  *
  * Before using an object allocated from zs_malloc, it must be mapped using
  * this function. When done with the object, it must be unmapped using
- * zs_unmap_object
+ * zs_unmap_object.
+ *
+ * Only one object can be mapped per cpu at a time. There is no protection
+ * against nested mappings.
+ *
+ * This function returns with preemption and page faults disabled.
 */
 void *zs_map_object(struct zs_pool *pool, unsigned long handle)
 {