Merge tag 'for-6.10-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...

[thirdparty/kernel/stable.git] / mm / zsmalloc.c

diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
index 7d7cb3eaabe029beaaf522c8521e8589cd0fafdd..b42d3545ca856f19645c73c938864065631b261d 100644 (file)
--- a/mm/zsmalloc.c
+++ b/mm/zsmalloc.c
@@ -399,9 +399,9 @@ static void zs_zpool_unmap(void *pool, unsigned long handle)
        zs_unmap_object(pool, handle);
 }
 
-static u64 zs_zpool_total_size(void *pool)
+static u64 zs_zpool_total_pages(void *pool)
 {
-       return zs_get_total_pages(pool) << PAGE_SHIFT;
+       return zs_get_total_pages(pool);
 }
 
 static struct zpool_driver zs_zpool_driver = {
@@ -414,7 +414,7 @@ static struct zpool_driver zs_zpool_driver = {
        .free =                   zs_zpool_free,
        .map =                    zs_zpool_map,
        .unmap =                  zs_zpool_unmap,
-       .total_size =             zs_zpool_total_size,
+       .total_pages =            zs_zpool_total_pages,
 };
 
 MODULE_ALIAS("zpool-zsmalloc");