diff --git a/mm/zswapd.c b/mm/zswapd.c
index 36e8ffd42b73aa14f3b5f838a29fc48fbf5788f3..b5fcb0d2aa08417e7e788807d93f7265c29ddc3a 100644
--- a/mm/zswapd.c
+++ b/mm/zswapd.c
@@ -127,7 +127,7 @@ static u64 swapout(u64 req_size)
 	struct mem_cgroup *memcg = NULL;
 	u64 write_size = 0;
 
-	while ((memcg = get_next_memcg(memcg))) {
+	while ((memcg = get_next_memcg(memcg)) != NULL) {
 		write_size += swapout_memcg(memcg, req_size - write_size);
 		if (write_size >= req_size)
 			break;
@@ -141,7 +141,7 @@ static unsigned long long get_zram_used_pages(void)
 	struct mem_cgroup *memcg = NULL;
 	unsigned long long zram_pages = 0;
 
-	while ((memcg = get_next_memcg(memcg)))
+	while ((memcg = get_next_memcg(memcg)) != NULL)
 		zram_pages += memcg_data_size(memcg, CACHE_PAGE);
 
 	return zram_pages;
@@ -152,7 +152,7 @@ static unsigned long long get_eswap_used_pages(void)
 	struct mem_cgroup *memcg = NULL;
 	unsigned long long eswap_pages = 0;
 
-	while ((memcg = get_next_memcg(memcg)))
+	while ((memcg = get_next_memcg(memcg)) != NULL)
 		eswap_pages += memcg_data_size(memcg, SWAP_PAGE);
 
 	return eswap_pages;
@@ -163,7 +163,7 @@ static unsigned long long get_zram_pagefault(void)
 	struct mem_cgroup *memcg = NULL;
 	unsigned long long cache_fault = 0;
 
-	while ((memcg = get_next_memcg(memcg)))
+	while ((memcg = get_next_memcg(memcg)) != NULL)
 		cache_fault += memcg_data_size(memcg, CACHE_FAULT);
 
 	return cache_fault;
@@ -236,7 +236,7 @@ static void snapshot_anon_refaults(void)
 {
 	struct mem_cgroup *memcg = NULL;
 
-	while (memcg = get_next_memcg(memcg))
+	while ((memcg = get_next_memcg(memcg)) != NULL)
 		memcg->memcg_reclaimed.reclaimed_pagefault = memcg_data_size(memcg, CACHE_FAULT);
 
 	last_anon_pagefault = get_zram_pagefault();
@@ -398,7 +398,7 @@ int get_zram_current_watermark(void)
 	/* page to ratio */
 	diff_buffers = div64_s64(diff_buffers * percent_constant, nr_total);
 
-	return min(zram_wm_ratio, zram_wm_ratio - diff_buffers);
+	return min((long long)zram_wm_ratio, zram_wm_ratio - diff_buffers);
 }
 
 bool zram_watermark_ok(void)
@@ -572,7 +572,7 @@ static bool zswapd_shrink_anon(pg_data_t *pgdat, struct scan_control *sc)
 	struct mem_cgroup *memcg = NULL;
 	unsigned long nr[NR_LRU_LISTS];
 
-	while ((memcg = get_next_memcg(memcg))) {
+	while ((memcg = get_next_memcg(memcg)) != NULL) {
 		struct lruvec *lruvec = mem_cgroup_lruvec(memcg, pgdat);
 		u64 nr_active, nr_inactive, nr_zram, nr_eswap, zram_ratio;
 
@@ -634,7 +634,7 @@ static u64 __calc_nr_to_reclaim(void)
 		reclaim_size = high_buffers - buffers;
 
 	/* once max reclaim target is max_reclaim_size */
-	reclaim_size = min(reclaim_size, max_reclaim_size);
+	reclaim_size = min(reclaim_size, (u64)max_reclaim_size);
 
 	/* MB to pages */
 	return div_u64(reclaim_size * SZ_1M, PAGE_SIZE);
diff --git a/mm/zswapd_control.c b/mm/zswapd_control.c
index 934eff21f09b2a0a1b35a0a6459b0b1b03fe8e18..d7ea6a6fe2cb5f7bfc0e317738bc3eafa7570a31 100644
--- a/mm/zswapd_control.c
+++ b/mm/zswapd_control.c
@@ -517,50 +517,6 @@ static int memcg_active_app_info_list_show(struct seq_file *m, void *v)
 	return 0;
 }
 
-static int report_app_info_show(struct seq_file *m, void *v)
-{
-	struct mem_cgroup_per_node *mz = NULL;
-	struct mem_cgroup *memcg = NULL;
-	struct lruvec *lruvec = NULL;
-	unsigned long eswap_size;
-	unsigned long zram_size;
-	unsigned long anon_size;
-
-	while ((memcg = get_next_memcg(memcg))) {
-		u64 score = atomic64_read(&memcg->memcg_reclaimed.app_score);
-
-		mz = mem_cgroup_nodeinfo(memcg, 0);
-		if (!mz) {
-			get_next_memcg_break(memcg);
-			return 0;
-		}
-
-		lruvec = &mz->lruvec;
-		if (!lruvec) {
-			get_next_memcg_break(memcg);
-			return 0;
-		}
-
-		anon_size = lruvec_lru_size(lruvec, LRU_ACTIVE_ANON,
-			MAX_NR_ZONES) + lruvec_lru_size(lruvec,
-			LRU_INACTIVE_ANON, MAX_NR_ZONES);
-		eswap_size = memcg_data_size(memcg, SWAP_SIZE);
-		zram_size = memcg_data_size(memcg, CACHE_SIZE);
-
-		if (anon_size + zram_size + eswap_size == 0)
-			continue;
-
-		anon_size *= PAGE_SIZE / SZ_1K;
-		zram_size *= PAGE_SIZE / SZ_1K;
-		eswap_size *= PAGE_SIZE / SZ_1K;
-
-		seq_printf(m, "%s, %llu, %lu, %lu, %lu\n",
-			strlen(memcg->name) ? memcg->name : "root",
-			score, anon_size, zram_size, eswap_size);
-	}
-	return 0;
-}
-
 #ifdef CONFIG_HYPERHOLD_DEBUG
 static int avail_buffers_params_show(struct seq_file *m, void *v)
 {