diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index b6fcab5b3e5a..aa53bb6a6d24 100644
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -1360,13 +1360,15 @@ compress_again:
 				__GFP_NOWARN |
 				__GFP_HIGHMEM |
 				__GFP_MOVABLE |
-				__GFP_CMA);
+				__GFP_CMA |
+				__GFP_OFFLINABLE);
 	if (!handle) {
 		zcomp_stream_put(zram->comp);
 		atomic64_inc(&zram->stats.writestall);
 		handle = zs_malloc(zram->mem_pool, comp_len,
 				GFP_NOIO | __GFP_HIGHMEM |
-				__GFP_MOVABLE | __GFP_CMA);
+				__GFP_MOVABLE | __GFP_CMA |
+				__GFP_OFFLINABLE);
 		if (handle)
 			goto compress_again;
 		return -ENOMEM;
diff --git a/include/linux/highmem.h b/include/linux/highmem.h
index fd093eb91a94..246f8da042ed 100644
--- a/include/linux/highmem.h
+++ b/include/linux/highmem.h
@@ -205,12 +205,9 @@ static inline struct page *
 alloc_zeroed_user_highpage_movable(struct vm_area_struct *vma,
 					unsigned long vaddr)
 {
-#ifndef CONFIG_CMA_DIRECT_UTILIZATION
-	return __alloc_zeroed_user_highpage(__GFP_MOVABLE, vma, vaddr);
-#else
-	return __alloc_zeroed_user_highpage(__GFP_MOVABLE|__GFP_CMA, vma,
-						vaddr);
-#endif
+	return __alloc_zeroed_user_highpage(
+			__GFP_MOVABLE|__GFP_CMA|__GFP_OFFLINABLE, vma,
+			vaddr);
 }
 
 static inline void clear_highpage(struct page *page)
diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
index 1002aacc366c..5d5071351490 100644
--- a/mm/zsmalloc.c
+++ b/mm/zsmalloc.c
@@ -350,8 +350,8 @@ static void destroy_cache(struct zs_pool *pool)
 
 static unsigned long cache_alloc_handle(struct zs_pool *pool, gfp_t gfp)
 {
-	return (unsigned long)kmem_cache_alloc(pool->handle_cachep,
-			gfp & ~(__GFP_HIGHMEM|__GFP_MOVABLE|__GFP_CMA));
+	return (unsigned long)kmem_cache_alloc(pool->handle_cachep, gfp &
+		~(__GFP_HIGHMEM|__GFP_MOVABLE|__GFP_CMA|__GFP_OFFLINABLE));
 }
 
 static void cache_free_handle(struct zs_pool *pool, unsigned long handle)
@@ -361,8 +361,8 @@ static void cache_free_handle(struct zs_pool *pool, unsigned long handle)
 
 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|__GFP_CMA));
+	return kmem_cache_alloc(pool->zspage_cachep, flags &
+		~(__GFP_HIGHMEM|__GFP_MOVABLE|__GFP_CMA|__GFP_OFFLINABLE));
 }
 
 static void cache_free_zspage(struct zs_pool *pool, struct zspage *zspage)