[folded-merged] zsmalloc-introduce-zs_huge_class_size-function-v3.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: zsmalloc-introduce-zs_huge_class_size-function-v3
has been removed from the -mm tree.  Its filename was
     zsmalloc-introduce-zs_huge_class_size-function-v3.patch

This patch was dropped because it was folded into zsmalloc-introduce-zs_huge_class_size-function.patch

------------------------------------------------------
From: Sergey Senozhatsky <sergey.senozhatsky.work@xxxxxxxxx>
Subject: zsmalloc-introduce-zs_huge_class_size-function-v3

add pool param to zs_huge_class_size() (Minchan)

Link: http://lkml.kernel.org/r/20180314081833.1096-2-sergey.senozhatsky@xxxxxxxxx
Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@xxxxxxxxx>
Cc: Minchan Kim <minchan@xxxxxxxxxx>
Cc: Mike Rapoport <rppt@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 include/linux/zsmalloc.h |    2 +-
 mm/zsmalloc.c            |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff -puN include/linux/zsmalloc.h~zsmalloc-introduce-zs_huge_class_size-function-v3 include/linux/zsmalloc.h
--- a/include/linux/zsmalloc.h~zsmalloc-introduce-zs_huge_class_size-function-v3
+++ a/include/linux/zsmalloc.h
@@ -47,7 +47,7 @@ void zs_destroy_pool(struct zs_pool *poo
 unsigned long zs_malloc(struct zs_pool *pool, size_t size, gfp_t flags);
 void zs_free(struct zs_pool *pool, unsigned long obj);
 
-size_t zs_huge_class_size(void);
+size_t zs_huge_class_size(struct zs_pool *pool);
 
 void *zs_map_object(struct zs_pool *pool, unsigned long handle,
 			enum zs_mapmode mm);
diff -puN mm/zsmalloc.c~zsmalloc-introduce-zs_huge_class_size-function-v3 mm/zsmalloc.c
--- a/mm/zsmalloc.c~zsmalloc-introduce-zs_huge_class_size-function-v3
+++ a/mm/zsmalloc.c
@@ -1411,6 +1411,7 @@ EXPORT_SYMBOL_GPL(zs_unmap_object);
 /**
  * zs_huge_class_size() - Returns the size (in bytes) of the first huge
  *                        zsmalloc &size_class.
+ * @pool: zsmalloc pool to use
  *
  * The function returns the size of the first huge class - any object of equal
  * or bigger size will be stored in zspage consisting of a single physical
@@ -1420,7 +1421,7 @@ EXPORT_SYMBOL_GPL(zs_unmap_object);
  *
  * Return: the size (in bytes) of the first huge zsmalloc &size_class.
  */
-size_t zs_huge_class_size(void)
+size_t zs_huge_class_size(struct zs_pool *pool)
 {
 	return huge_class_size;
 }
_

Patches currently in -mm which might be from sergey.senozhatsky.work@xxxxxxxxx are

zsmalloc-introduce-zs_huge_class_size-function.patch
zram-drop-max_zpage_size-and-use-zs_huge_class_size.patch
zram-drop-max_zpage_size-and-use-zs_huge_class_size-v3.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



[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux