X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=mm%2Fzsmalloc.c;h=0a7f81aa2249c2c9925cceadd4737ec8c88bf259;hb=b0996ae48285364710bce812e70ce67771ea6ef7;hp=a8b5e749e84e7dbd50d325eecf84a47316145598;hpb=45471cd98decae5fced8b38e46c223f54a924814;p=firefly-linux-kernel-4.4.55.git

diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
index a8b5e749e84e..0a7f81aa2249 100644
--- a/mm/zsmalloc.c
+++ b/mm/zsmalloc.c
@@ -45,10 +45,6 @@
  *
  */
 
-#ifdef CONFIG_ZSMALLOC_DEBUG
-#define DEBUG
-#endif
-
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
@@ -313,7 +309,8 @@ static void record_obj(unsigned long handle, unsigned long obj)
 
 #ifdef CONFIG_ZPOOL
 
-static void *zs_zpool_create(char *name, gfp_t gfp, struct zpool_ops *zpool_ops)
+static void *zs_zpool_create(char *name, gfp_t gfp, struct zpool_ops *zpool_ops,
+			     struct zpool *zpool)
 {
 	return zs_create_pool(name, gfp);
 }