Unverified Commit 5ca8b1ea authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11578 net: fix one compile error in net_rship_refresh_timeout() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Jian <liujian56@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/FFLPLPCUVFRYTTNKLU7QRQDGR33V47C3/ 
 
https://gitee.com/openeuler/kernel/issues/IARV38 
 
Link:https://gitee.com/openeuler/kernel/pulls/11578

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents a41e8dae 3f9ffb41

net/core/filter.c

+3 −0
Original line number Diff line number Diff line
@@ -10787,7 +10787,10 @@ static int __init gnet_bpf_init(void) 
}

late_initcall(gnet_bpf_init);



#if defined(CONFIG_SCHED_TASK_RELATIONSHIP)

#include <linux/sched/relationship.h>

unsigned long net_numa_rship_jiffies __read_mostly = HZ / 10; /* 100ms */

#endif

BPF_CALL_3(bpf_sched_net_rship_submit, void *, reqbuf, size_t, sz, u64, flags)

{

#if defined(CONFIG_SCHED_TASK_RELATIONSHIP)

net/core/sysctl_net_core.c

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ int sysctl_devconf_inherit_init_net __read_mostly; 
EXPORT_SYMBOL(sysctl_devconf_inherit_init_net);



#ifdef CONFIG_SCHED_TASK_RELATIONSHIP

unsigned long net_numa_rship_jiffies __read_mostly = HZ / 10; /* 100ms */

static unsigned long net_numa_rship_ms_min = HZ / 10; /* 100ms */

static unsigned long net_numa_rship_ms_max = 100 * HZ; /* 100s */

#endif