forked from Minki/linux
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: 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>
This commit is contained in:
parent
747db954ca
commit
434584fe68
@ -12,8 +12,10 @@ enum {
|
||||
#ifndef __GENERATING_BOUNDS_H
|
||||
#include <generated/bounds.h>
|
||||
|
||||
struct pglist_data;
|
||||
|
||||
#ifdef CONFIG_MEMCG
|
||||
#include <linux/bit_spinlock.h>
|
||||
struct mem_cgroup;
|
||||
|
||||
/*
|
||||
* Page Cgroup can be considered as an extended mem_map.
|
||||
@ -27,16 +29,16 @@ struct page_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
|
||||
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
|
||||
void __init page_cgroup_init_flatmem(void);
|
||||
static inline void __init page_cgroup_init(void)
|
||||
extern void page_cgroup_init_flatmem(void);
|
||||
static inline void page_cgroup_init(void)
|
||||
{
|
||||
}
|
||||
#endif
|
||||
@ -48,11 +50,10 @@ static inline int PageCgroupUsed(struct page_cgroup *pc)
|
||||
{
|
||||
return !!(pc->flags & PCG_USED);
|
||||
}
|
||||
|
||||
#else /* CONFIG_MEMCG */
|
||||
#else /* !CONFIG_MEMCG */
|
||||
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)
|
||||
{
|
||||
}
|
||||
|
||||
static inline void __init page_cgroup_init_flatmem(void)
|
||||
static inline void page_cgroup_init_flatmem(void)
|
||||
{
|
||||
}
|
||||
|
||||
#endif /* CONFIG_MEMCG */
|
||||
|
||||
#include <linux/swap.h>
|
||||
|
Loading…
Reference in New Issue
Block a user