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

!5768 resctrl: fix undefined reference to lockdep_is_cpus_held() 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zeng Heng <zengheng4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/IRD4RYKA5R7Z5XVZZ2XGBURLZH4L5SRC/ 
Zeng Heng (2):
  resctrl: fix undefined reference to lockdep_is_cpus_held()
  fs/resctrl: Move rdtgroup_setup_default() out of init.text section


--
2.25.1
 
https://gitee.com/openeuler/kernel/issues/I8T2RT 
 
Link:https://gitee.com/openeuler/kernel/pulls/5768

 

Reviewed-by: default avatarWang ShaoBo <bobo.shaobowang@huawei.com>
Reviewed-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents eef4bcd9 5331aaca

fs/resctrl/rdtgroup.c

+1 −1
Original line number Diff line number Diff line
@@ -3758,7 +3758,7 @@ static void rdtgroup_destroy_root(void) 
	rdtgroup_default.kn = NULL;

}



static void __init rdtgroup_setup_default(void)

static void rdtgroup_setup_default(void)

{

	mutex_lock(&rdtgroup_mutex);

include/linux/resctrl.h

+1 −1
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ resctrl_get_domain_from_cpu(int cpu, struct rdt_resource *r) 
	 * about locks this thread holds will lead to false positives. Check

	 * someone is holding the CPUs lock.

	 */

	if (IS_ENABLED(CONFIG_LOCKDEP))

	if (IS_ENABLED(CONFIG_HOTPLUG_CPU) && IS_ENABLED(CONFIG_LOCKDEP))

		lockdep_is_cpus_held();



	list_for_each_entry_rcu(d, &r->domains, list) {