mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 19:07:52 +00:00
Merge branch 'core/urgent' into smp/hotplug to pick up dependencies
This commit is contained in:
commit
e877bde234
2 changed files with 8 additions and 2 deletions
|
@ -1201,6 +1201,8 @@ static struct cpuhp_step cpuhp_bp_states[] = {
|
|||
.teardown = takedown_cpu,
|
||||
.cant_stop = true,
|
||||
},
|
||||
#else
|
||||
[CPUHP_BRINGUP_CPU] = { },
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -122,10 +122,14 @@ static bool ignore_func(struct objtool_file *file, struct symbol *func)
|
|||
|
||||
/* check for STACK_FRAME_NON_STANDARD */
|
||||
if (file->whitelist && file->whitelist->rela)
|
||||
list_for_each_entry(rela, &file->whitelist->rela->rela_list, list)
|
||||
if (rela->sym->sec == func->sec &&
|
||||
list_for_each_entry(rela, &file->whitelist->rela->rela_list, list) {
|
||||
if (rela->sym->type == STT_SECTION &&
|
||||
rela->sym->sec == func->sec &&
|
||||
rela->addend == func->offset)
|
||||
return true;
|
||||
if (rela->sym->type == STT_FUNC && rela->sym == func)
|
||||
return true;
|
||||
}
|
||||
|
||||
/* check if it has a context switching instruction */
|
||||
func_for_each_insn(file, func, insn)
|
||||
|
|
Loading…
Reference in a new issue