linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Peng Zhang <zhangpeng362@huawei.com>
To: <linux-mm@kvack.org>
Cc: <akpm@linux-foundation.org>, <wangkefeng.wang@huawei.com>,
	<sunnanyong@huawei.com>, ZhangPeng <zhangpeng362@huawei.com>
Subject: [PATCH 1/7] mm: remove redundant K() macro definition
Date: Fri, 4 Aug 2023 09:25:53 +0800	[thread overview]
Message-ID: <20230804012559.2617515-2-zhangpeng362@huawei.com> (raw)
In-Reply-To: <20230804012559.2617515-1-zhangpeng362@huawei.com>

From: ZhangPeng <zhangpeng362@huawei.com>

Since commit eb8589b4f8c1 ("mm: move mem_init_print_info() to
mm_init.c"), the K() macro definition has been moved to mm/internal.h.
Therefore, the definitions in mm/memcontrol.c, mm/backing-dev.c and
mm/oom_kill.c are redundant. Drop redundant definitions.

Signed-off-by: ZhangPeng <zhangpeng362@huawei.com>
---
 mm/backing-dev.c | 3 +--
 mm/memcontrol.c  | 1 -
 mm/oom_kill.c    | 2 --
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/mm/backing-dev.c b/mm/backing-dev.c
index 3ffc3cfa7a14..fc44bfbf785e 100644
--- a/mm/backing-dev.c
+++ b/mm/backing-dev.c
@@ -16,6 +16,7 @@
 #include <linux/writeback.h>
 #include <linux/device.h>
 #include <trace/events/writeback.h>
+#include "internal.h"
 
 struct backing_dev_info noop_backing_dev_info;
 EXPORT_SYMBOL_GPL(noop_backing_dev_info);
@@ -34,8 +35,6 @@ LIST_HEAD(bdi_list);
 /* bdi_wq serves all asynchronous writeback tasks */
 struct workqueue_struct *bdi_wq;
 
-#define K(x) ((x) << (PAGE_SHIFT - 10))
-
 #ifdef CONFIG_DEBUG_FS
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 1ff51d8df84a..e290e7ed05f3 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -1626,7 +1626,6 @@ static void memory_stat_format(struct mem_cgroup *memcg, struct seq_buf *s)
 	WARN_ON_ONCE(seq_buf_has_overflowed(s));
 }
 
-#define K(x) ((x) << (PAGE_SHIFT-10))
 /**
  * mem_cgroup_print_oom_context: Print OOM information relevant to
  * memory controller.
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 612b5597d3af..471061a3a0f5 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -479,8 +479,6 @@ static DECLARE_WAIT_QUEUE_HEAD(oom_victims_wait);
 
 static bool oom_killer_disabled __read_mostly;
 
-#define K(x) ((x) << (PAGE_SHIFT-10))
-
 /*
  * task->mm can be NULL if the task is the exited group leader.  So to
  * determine whether the task is using a particular mm, we examine all the
-- 
2.25.1



  reply	other threads:[~2023-08-04  1:26 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-04  1:25 [PATCH 0/7] cleanup with helper macro K() Peng Zhang
2023-08-04  1:25 ` Peng Zhang [this message]
2023-08-07  8:31   ` [PATCH 1/7] mm: remove redundant K() macro definition Kefeng Wang
2023-08-07 15:20     ` David Hildenbrand
2023-08-08 10:44     ` zhangpeng (AS)
2023-08-04  1:25 ` [PATCH 2/7] mm/swapfile.c: use helper macro K() Peng Zhang
2023-08-07 15:18   ` David Hildenbrand
2023-08-04  1:25 ` [PATCH 3/7] mm/swap_state.c: " Peng Zhang
2023-08-07 15:19   ` David Hildenbrand
2023-08-04  1:25 ` [PATCH 4/7] mm/shmem.c: " Peng Zhang
2023-08-07 15:19   ` David Hildenbrand
2023-08-04  1:25 ` [PATCH 5/7] mm/nommu.c: " Peng Zhang
2023-08-07 15:19   ` David Hildenbrand
2023-08-04  1:25 ` [PATCH 6/7] mm/mmap.c: " Peng Zhang
2023-08-07 15:19   ` David Hildenbrand
2023-08-04  1:25 ` [PATCH 7/7] mm/hugetlb.c: " Peng Zhang
2023-08-07 15:20   ` David Hildenbrand
2023-08-04  3:39 ` [PATCH 0/7] cleanup with " Matthew Wilcox

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230804012559.2617515-2-zhangpeng362@huawei.com \
    --to=zhangpeng362@huawei.com \
    --cc=akpm@linux-foundation.org \
    --cc=linux-mm@kvack.org \
    --cc=sunnanyong@huawei.com \
    --cc=wangkefeng.wang@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox