diff options
| author | Thomas Gleixner | 2016-07-13 17:03:30 +0200 |
|---|---|---|
| committer | Thomas Gleixner | 2016-07-13 17:03:30 +0200 |
| commit | e877bde234ee8e7aa73b8b3e3f1f67bc99c9b034 (patch) | |
| tree | 64f2fd39a34e0a9223278e8b2a7a40887d77abe5 | |
| parent | Merge branch 'core/rcu' into smp/hotplug to pick up dependencies (diff) | |
| parent | cpu/hotplug: Keep enough storage space if SMP=n to avoid array out of bounds ... (diff) | |
| download | kernel-qcow2-linux-e877bde234ee8e7aa73b8b3e3f1f67bc99c9b034.tar.gz kernel-qcow2-linux-e877bde234ee8e7aa73b8b3e3f1f67bc99c9b034.tar.xz kernel-qcow2-linux-e877bde234ee8e7aa73b8b3e3f1f67bc99c9b034.zip | |
Merge branch 'core/urgent' into smp/hotplug to pick up dependencies
| -rw-r--r-- | kernel/cpu.c | 2 | ||||
| -rw-r--r-- | tools/objtool/builtin-check.c | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c index d948e44c471e..7b61887f7ccd 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -1201,6 +1201,8 @@ static struct cpuhp_step cpuhp_bp_states[] = { .teardown = takedown_cpu, .cant_stop = true, }, +#else + [CPUHP_BRINGUP_CPU] = { }, #endif }; diff --git a/tools/objtool/builtin-check.c b/tools/objtool/builtin-check.c index e8a1e69eb92c..25d803148f5c 100644 --- a/tools/objtool/builtin-check.c +++ b/tools/objtool/builtin-check.c @@ -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) |