On Tue 24-06-14 20:33:04, Vladimir Davydov wrote:
> 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@xxxxxxxxxxxxx>
Acked-by: Michal Hocko <mhocko@xxxxxxx>
> ---
> include/linux/page_cgroup.h | 22 +++++++++++-----------
> 1 file changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/include/linux/page_cgroup.h b/include/linux/page_cgroup.h
> index 97b5c39a31c8..23863edb95ff 100644
> --- a/include/linux/page_cgroup.h
> +++ b/include/linux/page_cgroup.h
> @@ -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 test_bit(PCG_USED, &pc->flags);
> }
> -
> -#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>
> --
> 1.7.10.4
>
--
Michal Hocko
SUSE Labs
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>