renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-29 07:34:06 +08:00
Code

Merge branch 'core/urgent' into smp/hotplug to pick up dependencies

Browse Source
This commit is contained in:
Thomas Gleixner 2016-07-13 17:03:30 +02:00
commit e877bde234
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/cpu.c
View File

@ -1201,6 +1201,8 @@ static struct cpuhp_step cpuhp_bp_states[] = {
.teardown = takedown_cpu, .teardown = takedown_cpu,
.cant_stop = true, .cant_stop = true,
}, },
#else
[CPUHP_BRINGUP_CPU] = { },
#endif #endif
}; };

8
tools/objtool/builtin-check.c
View File

@ -122,10 +122,14 @@ static bool ignore_func(struct objtool_file *file, struct symbol *func)
/* check for STACK_FRAME_NON_STANDARD */ /* check for STACK_FRAME_NON_STANDARD */
if (file->whitelist && file->whitelist->rela) if (file->whitelist && file->whitelist->rela)
list_for_each_entry(rela, &file->whitelist->rela->rela_list, list) list_for_each_entry(rela, &file->whitelist->rela->rela_list, list) {
if (rela->sym->sec == func->sec && if (rela->sym->type == STT_SECTION &&
rela->sym->sec == func->sec &&
rela->addend == func->offset) rela->addend == func->offset)
return true; return true;
if (rela->sym->type == STT_FUNC && rela->sym == func)
return true;
}
/* check if it has a context switching instruction */ /* check if it has a context switching instruction */
func_for_each_insn(file, func, insn) func_for_each_insn(file, func, insn)