Commit 434584fe authored by Vladimir Davydov's avatar Vladimir Davydov Committed by Linus Torvalds

page-cgroup: trivial cleanup

Add forward declarations for struct pglist_data, mem_cgroup.

Remove __init, __meminit from function prototypes and inline functions.

Remove redundant inclusion of bit_spinlock.h.
Signed-off-by: default avatarVladimir Davydov <vdavydov@parallels.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.cz>
Acked-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 747db954
...@@ -12,8 +12,10 @@ enum { ...@@ -12,8 +12,10 @@ enum {
#ifndef __GENERATING_BOUNDS_H #ifndef __GENERATING_BOUNDS_H
#include <generated/bounds.h> #include <generated/bounds.h>
struct pglist_data;
#ifdef CONFIG_MEMCG #ifdef CONFIG_MEMCG
#include <linux/bit_spinlock.h> struct mem_cgroup;
/* /*
* Page Cgroup can be considered as an extended mem_map. * Page Cgroup can be considered as an extended mem_map.
...@@ -27,16 +29,16 @@ struct page_cgroup { ...@@ -27,16 +29,16 @@ struct page_cgroup {
struct mem_cgroup *mem_cgroup; struct mem_cgroup *mem_cgroup;
}; };
void __meminit pgdat_page_cgroup_init(struct pglist_data *pgdat); extern void pgdat_page_cgroup_init(struct pglist_data *pgdat);
#ifdef CONFIG_SPARSEMEM #ifdef CONFIG_SPARSEMEM
static inline void __init page_cgroup_init_flatmem(void) static inline void page_cgroup_init_flatmem(void)
{ {
} }
extern void __init page_cgroup_init(void); extern void page_cgroup_init(void);
#else #else
void __init page_cgroup_init_flatmem(void); extern void page_cgroup_init_flatmem(void);
static inline void __init page_cgroup_init(void) static inline void page_cgroup_init(void)
{ {
} }
#endif #endif
...@@ -48,11 +50,10 @@ static inline int PageCgroupUsed(struct page_cgroup *pc) ...@@ -48,11 +50,10 @@ static inline int PageCgroupUsed(struct page_cgroup *pc)
{ {
return !!(pc->flags & PCG_USED); return !!(pc->flags & PCG_USED);
} }
#else /* !CONFIG_MEMCG */
#else /* CONFIG_MEMCG */
struct page_cgroup; struct page_cgroup;
static inline void __meminit pgdat_page_cgroup_init(struct pglist_data *pgdat) static inline void pgdat_page_cgroup_init(struct pglist_data *pgdat)
{ {
} }
...@@ -65,10 +66,9 @@ static inline void page_cgroup_init(void) ...@@ -65,10 +66,9 @@ static inline void page_cgroup_init(void)
{ {
} }
static inline void __init page_cgroup_init_flatmem(void) static inline void page_cgroup_init_flatmem(void)
{ {
} }
#endif /* CONFIG_MEMCG */ #endif /* CONFIG_MEMCG */
#include <linux/swap.h> #include <linux/swap.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment