diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-07-13 15:03:30 (GMT) |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-07-13 15:03:30 (GMT) |
| commit | e877bde234ee8e7aa73b8b3e3f1f67bc99c9b034 (patch) | |
| tree | 64f2fd39a34e0a9223278e8b2a7a40887d77abe5 | |
| parent | e1c4cde62b230c1110ac8e3552898c8582679c6f (diff) | |
| parent | a7c734140aa36413944eef0f8c660e0e2256357d (diff) | |
| download | linux-e877bde234ee8e7aa73b8b3e3f1f67bc99c9b034.tar.xz | |
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 d948e44..7b61887 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 e8a1e69..25d8031 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) |