mm: add new mmgrab() helper

[karo-tx-linux.git] / mm / zsmalloc.c

diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
index 9cc3c0b2c2c13fddddc6d5d52aca4f0b45fdc1ce..b7b1fb6c8c21d4d4d1c6b7cc17f179e062dce94b 100644 (file)
--- a/mm/zsmalloc.c
+++ b/mm/zsmalloc.c
@@ -24,8 +24,7 @@
  *
  * Usage of struct page flags:
  *     PG_private: identifies the first component page
- *     PG_private2: identifies the last component page
- *     PG_owner_priv_1: indentifies the huge component page
+ *     PG_owner_priv_1: identifies the huge component page
  *
  */
 
@@ -268,10 +267,6 @@ struct zs_pool {
 #endif
 };
 
-/*
- * A zspage's class index and fullness group
- * are encoded in its (first)page->mapping
- */
 #define FULLNESS_BITS  2
 #define CLASS_BITS     8
 #define ISOLATED_BITS  3
@@ -364,7 +359,7 @@ static struct zspage *cache_alloc_zspage(struct zs_pool *pool, gfp_t flags)
 {
        return kmem_cache_alloc(pool->zspage_cachep,
                        flags & ~(__GFP_HIGHMEM|__GFP_MOVABLE));
-};
+}
 
 static void cache_free_zspage(struct zs_pool *pool, struct zspage *zspage)
 {
@@ -938,7 +933,6 @@ static void reset_page(struct page *page)
 {
        __ClearPageMovable(page);
        ClearPagePrivate(page);
-       ClearPagePrivate2(page);
        set_page_private(page, 0);
        page_mapcount_reset(page);
        ClearPageHugeObject(page);
@@ -1085,7 +1079,7 @@ static void create_page_chain(struct size_class *class, struct zspage *zspage,
         * 2. each sub-page point to zspage using page->private
         *
         * we set PG_private to identify the first page (i.e. no other sub-page
-        * has this flag set) and PG_private_2 to identify the last page.
+        * has this flag set).
         */
        for (i = 0; i < nr_pages; i++) {
                page = pages[i];
@@ -1100,8 +1094,6 @@ static void create_page_chain(struct size_class *class, struct zspage *zspage,
                } else {
                        prev_page->freelist = page;
                }
-               if (i == nr_pages - 1)
-                       SetPagePrivate2(page);
                prev_page = page;
        }
 }
@@ -2383,7 +2375,7 @@ struct zs_pool *zs_create_pool(const char *name)
                goto err;
 
        /*
-        * Iterate reversly, because, size of size_class that we want to use
+        * Iterate reversely, because, size of size_class that we want to use
         * for merging should be larger or equal to current size.
         */
        for (i = zs_size_classes - 1; i >= 0; i--) {