The patch titled
Subject: zswap-dynamic-pool-creation-fix
has been removed from the -mm tree. Its filename was
zswap-dynamic-pool-creation-fix.patch
This patch was dropped because it was folded into zswap-dynamic-pool-creation.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: zswap-dynamic-pool-creation-fix
fix merge snafus
Cc: Dan Streetman <ddstreet@xxxxxxxx>
Cc: Seth Jennings <sjennings@xxxxxxxxxxxxxx>
Cc: Sergey Senozhatsky <sergey.senozhatsky.work@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/zswap.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff -puN mm/zswap.c~zswap-dynamic-pool-creation-fix mm/zswap.c
--- a/mm/zswap.c~zswap-dynamic-pool-creation-fix
+++ a/mm/zswap.c
@@ -173,6 +173,10 @@ static int zswap_writeback_entry(struct
static int zswap_pool_get(struct zswap_pool *pool);
static void zswap_pool_put(struct zswap_pool *pool);
+static const struct zpool_ops zswap_zpool_ops = {
+ .evict = zswap_writeback_entry
+};
+
static bool zswap_is_full(void)
{
return totalram_pages * zswap_max_pool_percent / 100 <
@@ -657,8 +661,6 @@ static void zswap_pool_put(struct zswap_
kref_put(&pool->kref, __zswap_pool_empty);
}
-}
-
/*********************************
* writeback code
**********************************/
@@ -1030,10 +1032,6 @@ static void zswap_frontswap_invalidate_a
zswap_trees[type] = NULL;
}
-static const struct zpool_ops zswap_zpool_ops = {
- .evict = zswap_writeback_entry
-};
-
static void zswap_frontswap_init(unsigned type)
{
struct zswap_tree *tree;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
dax-revert-userfaultfd-change.patch
zswap-dynamic-pool-creation.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
