aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorKirill A. Shutemov <kirill@shutemov.name>2012-05-29 18:06:56 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-29 19:22:25 -0400
commita0db00fcf5da79911b7ff2db63ea7c0a5711e096 (patch)
tree1b398808dbe3e672344049820a11b69889e3791e /mm
parent3a7951b4cf8c6be48e20523b724d9188f6c91ba7 (diff)
memcg: remove redundant parentheses
Signed-off-by: Kirill A. Shutemov <kirill@shutemov.name> Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Acked-by: Michal Hocko <mhocko@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/memcontrol.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 18becde87577..775b94b1b8bd 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -73,7 +73,7 @@ static int really_do_swap_account __initdata = 0;
73#endif 73#endif
74 74
75#else 75#else
76#define do_swap_account (0) 76#define do_swap_account 0
77#endif 77#endif
78 78
79 79
@@ -112,9 +112,9 @@ enum mem_cgroup_events_target {
112 MEM_CGROUP_TARGET_NUMAINFO, 112 MEM_CGROUP_TARGET_NUMAINFO,
113 MEM_CGROUP_NTARGETS, 113 MEM_CGROUP_NTARGETS,
114}; 114};
115#define THRESHOLDS_EVENTS_TARGET (128) 115#define THRESHOLDS_EVENTS_TARGET 128
116#define SOFTLIMIT_EVENTS_TARGET (1024) 116#define SOFTLIMIT_EVENTS_TARGET 1024
117#define NUMAINFO_EVENTS_TARGET (1024) 117#define NUMAINFO_EVENTS_TARGET 1024
118 118
119struct mem_cgroup_stat_cpu { 119struct mem_cgroup_stat_cpu {
120 long count[MEM_CGROUP_STAT_NSTATS]; 120 long count[MEM_CGROUP_STAT_NSTATS];
@@ -359,8 +359,8 @@ static bool move_file(void)
359 * Maximum loops in mem_cgroup_hierarchical_reclaim(), used for soft 359 * Maximum loops in mem_cgroup_hierarchical_reclaim(), used for soft
360 * limit reclaim to prevent infinite loops, if they ever occur. 360 * limit reclaim to prevent infinite loops, if they ever occur.
361 */ 361 */
362#define MEM_CGROUP_MAX_RECLAIM_LOOPS (100) 362#define MEM_CGROUP_MAX_RECLAIM_LOOPS 100
363#define MEM_CGROUP_MAX_SOFT_LIMIT_RECLAIM_LOOPS (2) 363#define MEM_CGROUP_MAX_SOFT_LIMIT_RECLAIM_LOOPS 2
364 364
365enum charge_type { 365enum charge_type {
366 MEM_CGROUP_CHARGE_TYPE_CACHE = 0, 366 MEM_CGROUP_CHARGE_TYPE_CACHE = 0,
@@ -376,8 +376,8 @@ enum charge_type {
376#define _MEM (0) 376#define _MEM (0)
377#define _MEMSWAP (1) 377#define _MEMSWAP (1)
378#define _OOM_TYPE (2) 378#define _OOM_TYPE (2)
379#define MEMFILE_PRIVATE(x, val) (((x) << 16) | (val)) 379#define MEMFILE_PRIVATE(x, val) ((x) << 16 | (val))
380#define MEMFILE_TYPE(val) (((val) >> 16) & 0xffff) 380#define MEMFILE_TYPE(val) ((val) >> 16 & 0xffff)
381#define MEMFILE_ATTR(val) ((val) & 0xffff) 381#define MEMFILE_ATTR(val) ((val) & 0xffff)
382/* Used for OOM nofiier */ 382/* Used for OOM nofiier */
383#define OOM_CONTROL (0) 383#define OOM_CONTROL (0)
@@ -1987,7 +1987,7 @@ struct memcg_stock_pcp {
1987 unsigned int nr_pages; 1987 unsigned int nr_pages;
1988 struct work_struct work; 1988 struct work_struct work;
1989 unsigned long flags; 1989 unsigned long flags;
1990#define FLUSHING_CACHED_CHARGE (0) 1990#define FLUSHING_CACHED_CHARGE 0
1991}; 1991};
1992static DEFINE_PER_CPU(struct memcg_stock_pcp, memcg_stock); 1992static DEFINE_PER_CPU(struct memcg_stock_pcp, memcg_stock);
1993static DEFINE_MUTEX(percpu_charge_mutex); 1993static DEFINE_MUTEX(percpu_charge_mutex);
@@ -2542,7 +2542,7 @@ static void __mem_cgroup_commit_charge(struct mem_cgroup *memcg,
2542 2542
2543#ifdef CONFIG_TRANSPARENT_HUGEPAGE 2543#ifdef CONFIG_TRANSPARENT_HUGEPAGE
2544 2544
2545#define PCGF_NOCOPY_AT_SPLIT ((1 << PCG_LOCK) | (1 << PCG_MIGRATION)) 2545#define PCGF_NOCOPY_AT_SPLIT (1 << PCG_LOCK | 1 << PCG_MIGRATION)
2546/* 2546/*
2547 * Because tail pages are not marked as "used", set it. We're under 2547 * Because tail pages are not marked as "used", set it. We're under
2548 * zone->lru_lock, 'splitting on pmd' and compound_lock. 2548 * zone->lru_lock, 'splitting on pmd' and compound_lock.