From: "Kirill A. Shutemov" <kirill@shutemov.name>
To: linux-mm@kvack.org, cgroups@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
containers@lists.linux-foundation.org,
KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>,
Balbir Singh <bsingharora@gmail.com>,
Michal Hocko <mhocko@suse.cz>,
Johannes Weiner <hannes@cmpxchg.org>,
"Kirill A. Shutemov" <kirill@shutemov.name>
Subject: [PATCH 6/6] memcg: drop redundant brackets
Date: Sat, 24 Dec 2011 05:00:19 +0200 [thread overview]
Message-ID: <1324695619-5537-6-git-send-email-kirill@shutemov.name> (raw)
In-Reply-To: <1324695619-5537-1-git-send-email-kirill@shutemov.name>
From: "Kirill A. Shutemov" <kirill@shutemov.name>
Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name>
---
mm/memcontrol.c | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 3833a7b..48cba05 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -73,7 +73,7 @@ static int really_do_swap_account __initdata = 0;
#endif
#else
-#define do_swap_account (0)
+#define do_swap_account 0
#endif
@@ -113,9 +113,9 @@ enum mem_cgroup_events_target {
MEM_CGROUP_TARGET_NUMAINFO,
MEM_CGROUP_NTARGETS,
};
-#define THRESHOLDS_EVENTS_TARGET (128)
-#define SOFTLIMIT_EVENTS_TARGET (1024)
-#define NUMAINFO_EVENTS_TARGET (1024)
+#define THRESHOLDS_EVENTS_TARGET 128
+#define SOFTLIMIT_EVENTS_TARGET 1024
+#define NUMAINFO_EVENTS_TARGET 1024
struct mem_cgroup_stat_cpu {
long count[MEM_CGROUP_STAT_NSTATS];
@@ -148,7 +148,7 @@ struct mem_cgroup_per_zone {
/* use container_of */
};
/* Macro for accessing counter */
-#define MEM_CGROUP_ZSTAT(mz, idx) ((mz)->count[(idx)])
+#define MEM_CGROUP_ZSTAT(mz, idx) ((mz)->count[idx])
struct mem_cgroup_per_node {
struct mem_cgroup_per_zone zoneinfo[MAX_NR_ZONES];
@@ -346,8 +346,8 @@ static bool move_file(void)
* Maximum loops in mem_cgroup_hierarchical_reclaim(), used for soft
* limit reclaim to prevent infinite loops, if they ever occur.
*/
-#define MEM_CGROUP_MAX_RECLAIM_LOOPS (100)
-#define MEM_CGROUP_MAX_SOFT_LIMIT_RECLAIM_LOOPS (2)
+#define MEM_CGROUP_MAX_RECLAIM_LOOPS 100
+#define MEM_CGROUP_MAX_SOFT_LIMIT_RECLAIM_LOOPS 2
enum charge_type {
MEM_CGROUP_CHARGE_TYPE_CACHE = 0,
@@ -368,11 +368,11 @@ enum mem_type {
_KMEM,
};
-#define MEMFILE_PRIVATE(x, val) (((x) << 16) | (val))
-#define MEMFILE_TYPE(val) (((val) >> 16) & 0xffff)
+#define MEMFILE_PRIVATE(x, val) ((x) << 16 | (val))
+#define MEMFILE_TYPE(val) ((val) >> 16 & 0xffff)
#define MEMFILE_ATTR(val) ((val) & 0xffff)
/* Used for OOM nofiier */
-#define OOM_CONTROL (0)
+#define OOM_CONTROL 0
/*
* Reclaim flags for mem_cgroup_hierarchical_reclaim
@@ -1913,7 +1913,7 @@ struct memcg_stock_pcp {
unsigned int nr_pages;
struct work_struct work;
unsigned long flags;
-#define FLUSHING_CACHED_CHARGE (0)
+#define FLUSHING_CACHED_CHARGE 0
};
static DEFINE_PER_CPU(struct memcg_stock_pcp, memcg_stock);
static DEFINE_MUTEX(percpu_charge_mutex);
@@ -2094,7 +2094,7 @@ static int __cpuinit memcg_cpu_hotplug_callback(struct notifier_block *nb,
struct memcg_stock_pcp *stock;
struct mem_cgroup *iter;
- if ((action == CPU_ONLINE)) {
+ if (action == CPU_ONLINE) {
for_each_mem_cgroup(iter)
synchronize_mem_cgroup_on_move(iter, cpu);
return NOTIFY_OK;
@@ -2458,8 +2458,8 @@ static void __mem_cgroup_commit_charge(struct mem_cgroup *memcg,
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
-#define PCGF_NOCOPY_AT_SPLIT ((1 << PCG_LOCK) | (1 << PCG_MOVE_LOCK) |\
- (1 << PCG_MIGRATION))
+#define PCGF_NOCOPY_AT_SPLIT (1 << PCG_LOCK | 1 << PCG_MOVE_LOCK |\
+ 1 << PCG_MIGRATION)
/*
* Because tail pages are not marked as "used", set it. We're under
* zone->lru_lock, 'splitting on pmd' and compound_lock.
--
1.7.7.3
next prev parent reply other threads:[~2011-12-24 3:00 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-24 3:00 [PATCH 1/6] memcg: fix unused variable warning Kirill A. Shutemov
2011-12-24 3:00 ` [PATCH 2/6] memcg: mark more functions/variables as static Kirill A. Shutemov
2011-12-26 6:28 ` KAMEZAWA Hiroyuki
2011-12-27 14:05 ` Michal Hocko
2011-12-24 3:00 ` [PATCH 3/6] memcg: remove unused variable Kirill A. Shutemov
2011-12-26 6:29 ` KAMEZAWA Hiroyuki
2011-12-27 14:08 ` Michal Hocko
2011-12-24 3:00 ` [PATCH 4/6] memcg: mark stat field of mem_cgroup struct as __percpu Kirill A. Shutemov
2011-12-26 6:30 ` KAMEZAWA Hiroyuki
2011-12-27 14:11 ` Michal Hocko
2011-12-24 3:00 ` [PATCH 5/6] memcg: fix broken boolen expression Kirill A. Shutemov
2011-12-26 6:31 ` KAMEZAWA Hiroyuki
2011-12-26 6:57 ` Kirill A. Shutemov
2012-01-03 20:54 ` Greg KH
2011-12-27 14:17 ` Michal Hocko
2012-04-04 21:34 ` Andrew Morton
2012-04-05 10:17 ` Kirill A. Shutemov
2011-12-24 3:00 ` Kirill A. Shutemov [this message]
2011-12-26 6:40 ` [PATCH 6/6] memcg: drop redundant brackets KAMEZAWA Hiroyuki
2011-12-27 14:28 ` Michal Hocko
2011-12-26 6:25 ` [PATCH 1/6] memcg: fix unused variable warning KAMEZAWA Hiroyuki
2011-12-26 6:36 ` Kirill A. Shutemov
2011-12-26 6:42 ` KAMEZAWA Hiroyuki
2011-12-26 6:47 ` Kirill A. Shutemov
2011-12-26 6:50 ` KAMEZAWA Hiroyuki
2011-12-27 13:57 ` [PATCH] Makefiles: Disable unused-variable warning (was: Re: [PATCH 1/6] memcg: fix unused variable warning) Michal Hocko
2011-12-27 18:26 ` Kirill A. Shutemov
2011-12-29 10:42 ` Michal Hocko
2011-12-29 11:08 ` Kirill A. Shutemov
2011-12-29 11:16 ` Michal Hocko
2012-01-08 15:01 ` [PATCH] Makefiles: Disable unused-variable warning Michal Marek
2012-01-10 8:52 ` Michal Hocko
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=1324695619-5537-6-git-send-email-kirill@shutemov.name \
--to=kirill@shutemov.name \
--cc=bsingharora@gmail.com \
--cc=cgroups@vger.kernel.org \
--cc=containers@lists.linux-foundation.org \
--cc=hannes@cmpxchg.org \
--cc=kamezawa.hiroyu@jp.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@suse.cz \
/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;
as well as URLs for NNTP newsgroup(s).