Merge tag 'v5.12-rc7' into ecryptfs/next

[linux-2.6-microblaze.git] / mm / zbud.c

diff --git a/mm/zbud.c b/mm/zbud.c
index bc93aa4..7ec5f27 100644 (file)
--- a/mm/zbud.c
+++ b/mm/zbud.c
@@ -203,6 +203,7 @@ static u64 zbud_zpool_total_size(void *pool)
 
 static struct zpool_driver zbud_zpool_driver = {
        .type =         "zbud",
+       .sleep_mapped = true,
        .owner =        THIS_MODULE,
        .create =       zbud_zpool_create,
        .destroy =      zbud_zpool_destroy,
@@ -367,7 +368,6 @@ int zbud_alloc(struct zbud_pool *pool, size_t size, gfp_t gfp,
        spin_lock(&pool->lock);
 
        /* First, try to find an unbuddied zbud page. */
-       zhdr = NULL;
        for_each_unbuddied_list(i, chunks) {
                if (!list_empty(&pool->unbuddied[i])) {
                        zhdr = list_first_entry(&pool->unbuddied[i],