Unverified Commit 7aef5961 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!1198 [sync] PR-1190: memcg: fix implicit declaration of memcg_print_bad_task() 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/1190 
 
PR sync from: Liu Shixin <liushixin2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/XR7NP7IV7MBMBYASGLC3ZEO7URQ2IHV7/ 
 
 
Link:https://gitee.com/openeuler/kernel/pulls/1198

 

Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 50f59f9d c831dff5

drivers/memstick/host/r592.c

+1 −1
Original line number Diff line number Diff line
@@ -828,7 +828,7 @@ static void r592_remove(struct pci_dev *pdev) 
	/* Stop the processing thread.

	That ensures that we won't take any more requests */

	kthread_stop(dev->io_thread);



	del_timer_sync(&dev->detect_timer);

	r592_enable_device(dev, false);



	while (!error && dev->req) {

include/linux/memcontrol.h

+6 −0
Original line number Diff line number Diff line
@@ -404,6 +404,8 @@ bool memcg_low_priority_scan_tasks(int (*)(struct task_struct *, void *), 
void memcg_print_bad_task(struct oom_control *oc);

extern int sysctl_memcg_qos_handler(struct ctl_table *table,

		int write, void __user *buffer, size_t *length, loff_t *ppos);

#else

void memcg_print_bad_task(struct oom_control *oc);

#endif



/*
@@ -1679,6 +1681,10 @@ unsigned long mem_cgroup_soft_limit_reclaim(pg_data_t *pgdat, int order, 
{

	return 0;

}



static inline void memcg_print_bad_task(struct oom_control *oc)

{

}

#endif /* CONFIG_MEMCG */



/* idx can be of type enum memcg_stat_item or node_stat_item */