--- zzzz-none-000/linux-3.10.107/include/linux/memcontrol.h 2017-06-27 09:49:32.000000000 +0000 +++ vr9-7490-729/linux-3.10.107/include/linux/memcontrol.h 2021-11-10 11:53:56.000000000 +0000 @@ -186,6 +186,24 @@ enum mem_cgroup_page_stat_item idx, int val); +static inline void mem_cgroup_oom_enable(void) +{ +} + +static inline void mem_cgroup_oom_disable(void) +{ +} + +static inline bool task_in_memcg_oom(struct task_struct *p) +{ + return false; +} + +static inline bool mem_cgroup_oom_synchronize(bool wait) +{ + return false; +} + static inline void mem_cgroup_inc_page_stat(struct page *page, enum mem_cgroup_page_stat_item idx) { @@ -221,30 +239,37 @@ #else /* CONFIG_MEMCG */ struct mem_cgroup; -static inline int mem_cgroup_newpage_charge(struct page *page, - struct mm_struct *mm, gfp_t gfp_mask) +static inline int mem_cgroup_newpage_charge(struct page *page __maybe_unused, + struct mm_struct *mm __maybe_unused, + gfp_t gfp_mask __maybe_unused) { return 0; } -static inline int mem_cgroup_cache_charge(struct page *page, - struct mm_struct *mm, gfp_t gfp_mask) +static inline int mem_cgroup_cache_charge(struct page *page __maybe_unused, + struct mm_struct *mm __maybe_unused, + gfp_t gfp_mask __maybe_unused) { return 0; } -static inline int mem_cgroup_try_charge_swapin(struct mm_struct *mm, - struct page *page, gfp_t gfp_mask, struct mem_cgroup **memcgp) +static inline int mem_cgroup_try_charge_swapin( + struct mm_struct *mm __maybe_unused, + struct page *page __maybe_unused, + gfp_t gfp_mask __maybe_unused, + struct mem_cgroup **memcgp __maybe_unused) { return 0; } -static inline void mem_cgroup_commit_charge_swapin(struct page *page, - struct mem_cgroup *memcg) +static inline void mem_cgroup_commit_charge_swapin( + struct page *page __maybe_unused, + struct mem_cgroup *memcg __maybe_unused) { } -static inline void mem_cgroup_cancel_charge_swapin(struct mem_cgroup *memcg) +static inline void mem_cgroup_cancel_charge_swapin( + struct mem_cgroup *memcg __maybe_unused) { } @@ -256,175 +281,181 @@ { } -static inline void mem_cgroup_uncharge_page(struct page *page) +static inline void mem_cgroup_uncharge_page(struct page *page __maybe_unused) { } -static inline void mem_cgroup_uncharge_cache_page(struct page *page) +static inline void mem_cgroup_uncharge_cache_page( + struct page *page __maybe_unused) { } -static inline struct lruvec *mem_cgroup_zone_lruvec(struct zone *zone, - struct mem_cgroup *memcg) +static inline struct lruvec *mem_cgroup_zone_lruvec( + struct zone *zone, + struct mem_cgroup *memcg __maybe_unused) { return &zone->lruvec; } -static inline struct lruvec *mem_cgroup_page_lruvec(struct page *page, - struct zone *zone) +static inline struct lruvec *mem_cgroup_page_lruvec( + struct page *page __maybe_unused, + struct zone *zone) { return &zone->lruvec; } -static inline struct mem_cgroup *try_get_mem_cgroup_from_page(struct page *page) +static inline struct mem_cgroup *try_get_mem_cgroup_from_page( + struct page *page __maybe_unused) { return NULL; } -static inline struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm) +static inline struct mem_cgroup *try_get_mem_cgroup_from_mm( + struct mm_struct *mm __maybe_unused) { return NULL; } -static inline bool mm_match_cgroup(struct mm_struct *mm, - struct mem_cgroup *memcg) +static inline bool mm_match_cgroup(struct mm_struct *mm __maybe_unused, + struct mem_cgroup *memcg __maybe_unused) { return true; } -static inline int task_in_mem_cgroup(struct task_struct *task, - const struct mem_cgroup *memcg) +static inline int task_in_mem_cgroup( + struct task_struct *task __maybe_unused, + const struct mem_cgroup *memcg __maybe_unused) { return 1; } static inline struct cgroup_subsys_state - *mem_cgroup_css(struct mem_cgroup *memcg) + *mem_cgroup_css(struct mem_cgroup *memcg __maybe_unused) { return NULL; } static inline void -mem_cgroup_prepare_migration(struct page *page, struct page *newpage, - struct mem_cgroup **memcgp) +mem_cgroup_prepare_migration(struct page *page __maybe_unused, + struct page *newpage __maybe_unused, + struct mem_cgroup **memcgp __maybe_unused) { } -static inline void mem_cgroup_end_migration(struct mem_cgroup *memcg, - struct page *oldpage, struct page *newpage, bool migration_ok) +static inline void mem_cgroup_end_migration( + struct mem_cgroup *memcg __maybe_unused, + struct page *oldpage __maybe_unused, + struct page *newpage __maybe_unused, + bool migration_ok __maybe_unused) { } static inline struct mem_cgroup * -mem_cgroup_iter(struct mem_cgroup *root, - struct mem_cgroup *prev, - struct mem_cgroup_reclaim_cookie *reclaim) +mem_cgroup_iter(struct mem_cgroup *root __maybe_unused, + struct mem_cgroup *prev __maybe_unused, + struct mem_cgroup_reclaim_cookie *reclaim __maybe_unused) { return NULL; } -static inline void mem_cgroup_iter_break(struct mem_cgroup *root, - struct mem_cgroup *prev) +static inline void mem_cgroup_iter_break(struct mem_cgroup *root __maybe_unused, + struct mem_cgroup *prev __maybe_unused) { } -static inline bool mem_cgroup_disabled(void) +static inline bool mem_cgroup_disabled(void __maybe_unused) { return true; } static inline int -mem_cgroup_inactive_anon_is_low(struct lruvec *lruvec) +mem_cgroup_inactive_anon_is_low(struct lruvec *lruvec __maybe_unused) { return 1; } static inline unsigned long -mem_cgroup_get_lru_size(struct lruvec *lruvec, enum lru_list lru) +mem_cgroup_get_lru_size(struct lruvec *lruvec __maybe_unused, + enum lru_list lru __maybe_unused) { return 0; } static inline void -mem_cgroup_update_lru_size(struct lruvec *lruvec, enum lru_list lru, - int increment) +mem_cgroup_update_lru_size(struct lruvec *lruvec __maybe_unused, + enum lru_list lru __maybe_unused, + int increment __maybe_unused) { } static inline void -mem_cgroup_print_oom_info(struct mem_cgroup *memcg, struct task_struct *p) -{ -} - -static inline void mem_cgroup_begin_update_page_stat(struct page *page, - bool *locked, unsigned long *flags) -{ -} - -static inline void mem_cgroup_end_update_page_stat(struct page *page, - bool *locked, unsigned long *flags) -{ -} - -static inline void mem_cgroup_oom_enable(void) +mem_cgroup_print_oom_info(struct mem_cgroup *memcg __maybe_unused, + struct task_struct *p __maybe_unused) { } -static inline void mem_cgroup_oom_disable(void) -{ -} - -static inline bool task_in_memcg_oom(struct task_struct *p) +static inline void mem_cgroup_begin_update_page_stat( + struct page *page __maybe_unused, + bool *locked __maybe_unused, + unsigned long *flags __maybe_unused) { - return false; } -static inline bool mem_cgroup_oom_synchronize(bool wait) +static inline void mem_cgroup_end_update_page_stat( + struct page *page __maybe_unused, + bool *locked __maybe_unused, + unsigned long *flags __maybe_unused) { - return false; } -static inline void mem_cgroup_inc_page_stat(struct page *page, - enum mem_cgroup_page_stat_item idx) +static inline void mem_cgroup_inc_page_stat( + struct page *page __maybe_unused, + enum mem_cgroup_page_stat_item idx __maybe_unused) { } -static inline void mem_cgroup_dec_page_stat(struct page *page, - enum mem_cgroup_page_stat_item idx) +static inline void mem_cgroup_dec_page_stat( + struct page *page __maybe_unused, + enum mem_cgroup_page_stat_item idx __maybe_unused) { } static inline -unsigned long mem_cgroup_soft_limit_reclaim(struct zone *zone, int order, - gfp_t gfp_mask, - unsigned long *total_scanned) +unsigned long mem_cgroup_soft_limit_reclaim( + struct zone *zone __maybe_unused, + int order __maybe_unused, + gfp_t gfp_mask __maybe_unused, + unsigned long *total_scanned __maybe_unused) { return 0; } -static inline void mem_cgroup_split_huge_fixup(struct page *head) +static inline void mem_cgroup_split_huge_fixup( + struct page *head __maybe_unused) { } static inline -void mem_cgroup_count_vm_event(struct mm_struct *mm, enum vm_event_item idx) +void mem_cgroup_count_vm_event(struct mm_struct *mm __maybe_unused, + enum vm_event_item idx __maybe_unused) { } -static inline void mem_cgroup_replace_page_cache(struct page *oldpage, - struct page *newpage) +static inline void mem_cgroup_replace_page_cache( + struct page *oldpage __maybe_unused, + struct page *newpage __maybe_unused) { } #endif /* CONFIG_MEMCG */ #if !defined(CONFIG_MEMCG) || !defined(CONFIG_DEBUG_VM) static inline bool -mem_cgroup_bad_page_check(struct page *page) +mem_cgroup_bad_page_check(struct page *page __maybe_unused) { return false; } static inline void -mem_cgroup_print_bad_page(struct page *page) +mem_cgroup_print_bad_page(struct page *page __maybe_unused) { } #endif @@ -440,10 +471,10 @@ void sock_update_memcg(struct sock *sk); void sock_release_memcg(struct sock *sk); #else -static inline void sock_update_memcg(struct sock *sk) +static inline void sock_update_memcg(struct sock *sk __maybe_unused) { } -static inline void sock_release_memcg(struct sock *sk) +static inline void sock_release_memcg(struct sock *sk __maybe_unused) { } #endif /* CONFIG_INET && CONFIG_MEMCG_KMEM */ @@ -608,48 +639,55 @@ } static inline bool -memcg_kmem_newpage_charge(gfp_t gfp, struct mem_cgroup **memcg, int order) +memcg_kmem_newpage_charge(gfp_t gfp __maybe_unused, + struct mem_cgroup **memcg __maybe_unused, + int order __maybe_unused) { return true; } -static inline void memcg_kmem_uncharge_pages(struct page *page, int order) +static inline void memcg_kmem_uncharge_pages(struct page *page __maybe_unused, + int order __maybe_unused) { } static inline void -memcg_kmem_commit_charge(struct page *page, struct mem_cgroup *memcg, int order) +memcg_kmem_commit_charge(struct page *page __maybe_unused, + struct mem_cgroup *memcg __maybe_unused, + int order __maybe_unused) { } -static inline int memcg_cache_id(struct mem_cgroup *memcg) +static inline int memcg_cache_id(struct mem_cgroup *memcg __maybe_unused) { return -1; } static inline int -memcg_register_cache(struct mem_cgroup *memcg, struct kmem_cache *s, - struct kmem_cache *root_cache) +memcg_register_cache(struct mem_cgroup *memcg __maybe_unused, + struct kmem_cache *s __maybe_unused, + struct kmem_cache *root_cache __maybe_unused) { return 0; } -static inline void memcg_release_cache(struct kmem_cache *cachep) +static inline void memcg_release_cache(struct kmem_cache *cachep __maybe_unused) { } -static inline void memcg_cache_list_add(struct mem_cgroup *memcg, - struct kmem_cache *s) +static inline void memcg_cache_list_add(struct mem_cgroup *memcg __maybe_unused, + struct kmem_cache *s __maybe_unused) { } static inline struct kmem_cache * -memcg_kmem_get_cache(struct kmem_cache *cachep, gfp_t gfp) +memcg_kmem_get_cache(struct kmem_cache *cachep, gfp_t gfp __maybe_unused) { return cachep; } -static inline void kmem_cache_destroy_memcg_children(struct kmem_cache *s) +static inline void kmem_cache_destroy_memcg_children(struct kmem_cache *s + __maybe_unused) { } #endif /* CONFIG_MEMCG_KMEM */