diff options
author | Vladimir Davydov <vdavydov@parallels.com> | 2014-08-08 17:19:28 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-08 18:57:18 -0400 |
commit | 9a3f4d85d58cb4e02e226f9be946d54c33eb715b (patch) | |
tree | 49de1db1a09ee321ce1466651e82d96ab88c6ab1 | |
parent | 434584fe68155f884b19f32b3befec8972c5d563 (diff) |
page-cgroup: get rid of NR_PCG_FLAGS
It's not used anywhere today, so let's remove it.
Signed-off-by: Vladimir Davydov <vdavydov@parallels.com>
Acked-by: Michal Hocko <mhocko@suse.cz>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | include/linux/page_cgroup.h | 6 | ||||
-rw-r--r-- | kernel/bounds.c | 2 |
2 files changed, 0 insertions, 8 deletions
diff --git a/include/linux/page_cgroup.h b/include/linux/page_cgroup.h index b8f8c9e36a3e..9d9f540658f5 100644 --- a/include/linux/page_cgroup.h +++ b/include/linux/page_cgroup.h | |||
@@ -6,12 +6,8 @@ enum { | |||
6 | PCG_USED = 0x01, /* This page is charged to a memcg */ | 6 | PCG_USED = 0x01, /* This page is charged to a memcg */ |
7 | PCG_MEM = 0x02, /* This page holds a memory charge */ | 7 | PCG_MEM = 0x02, /* This page holds a memory charge */ |
8 | PCG_MEMSW = 0x04, /* This page holds a memory+swap charge */ | 8 | PCG_MEMSW = 0x04, /* This page holds a memory+swap charge */ |
9 | __NR_PCG_FLAGS, | ||
10 | }; | 9 | }; |
11 | 10 | ||
12 | #ifndef __GENERATING_BOUNDS_H | ||
13 | #include <generated/bounds.h> | ||
14 | |||
15 | struct pglist_data; | 11 | struct pglist_data; |
16 | 12 | ||
17 | #ifdef CONFIG_MEMCG | 13 | #ifdef CONFIG_MEMCG |
@@ -107,6 +103,4 @@ static inline void swap_cgroup_swapoff(int type) | |||
107 | 103 | ||
108 | #endif /* CONFIG_MEMCG_SWAP */ | 104 | #endif /* CONFIG_MEMCG_SWAP */ |
109 | 105 | ||
110 | #endif /* !__GENERATING_BOUNDS_H */ | ||
111 | |||
112 | #endif /* __LINUX_PAGE_CGROUP_H */ | 106 | #endif /* __LINUX_PAGE_CGROUP_H */ |
diff --git a/kernel/bounds.c b/kernel/bounds.c index 9fd4246b04b8..e1d1d1952bfa 100644 --- a/kernel/bounds.c +++ b/kernel/bounds.c | |||
@@ -9,7 +9,6 @@ | |||
9 | #include <linux/page-flags.h> | 9 | #include <linux/page-flags.h> |
10 | #include <linux/mmzone.h> | 10 | #include <linux/mmzone.h> |
11 | #include <linux/kbuild.h> | 11 | #include <linux/kbuild.h> |
12 | #include <linux/page_cgroup.h> | ||
13 | #include <linux/log2.h> | 12 | #include <linux/log2.h> |
14 | #include <linux/spinlock_types.h> | 13 | #include <linux/spinlock_types.h> |
15 | 14 | ||
@@ -18,7 +17,6 @@ void foo(void) | |||
18 | /* The enum constants to put into include/generated/bounds.h */ | 17 | /* The enum constants to put into include/generated/bounds.h */ |
19 | DEFINE(NR_PAGEFLAGS, __NR_PAGEFLAGS); | 18 | DEFINE(NR_PAGEFLAGS, __NR_PAGEFLAGS); |
20 | DEFINE(MAX_NR_ZONES, __MAX_NR_ZONES); | 19 | DEFINE(MAX_NR_ZONES, __MAX_NR_ZONES); |
21 | DEFINE(NR_PCG_FLAGS, __NR_PCG_FLAGS); | ||
22 | #ifdef CONFIG_SMP | 20 | #ifdef CONFIG_SMP |
23 | DEFINE(NR_CPUS_BITS, ilog2(CONFIG_NR_CPUS)); | 21 | DEFINE(NR_CPUS_BITS, ilog2(CONFIG_NR_CPUS)); |
24 | #endif | 22 | #endif |