Merge branch 'linus' into perf/urgent, to resolve conflict

 Conflicts:
	arch/powerpc/configs/85xx/kmp204x_defconfig

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/tools/objtool/builtin-check.c b/tools/objtool/builtin-check.c
index 5fc52ee3264c..4cfdbb5b6967 100644
--- a/tools/objtool/builtin-check.c
+++ b/tools/objtool/builtin-check.c
@@ -339,13 +339,13 @@ static int add_dead_ends(struct objtool_file *file)
         struct instruction *insn;
         bool found;
 
-        sec = find_section_by_name(file->elf, ".rela__unreachable");
+        sec = find_section_by_name(file->elf, ".rela.discard.unreachable");
         if (!sec)
                 return 0;
 
         list_for_each_entry(rela, &sec->rela_list, list) {
                 if (rela->sym->type != STT_SECTION) {
-                        WARN("unexpected relocation symbol type in .rela__unreachable");
+                        WARN("unexpected relocation symbol type in %s", sec->name);
                         return -1;
                 }
                 insn = find_insn(file, rela->sym->sec, rela->addend);
@@ -1272,7 +1272,7 @@ int cmd_check(int argc, const char **argv)
 
         INIT_LIST_HEAD(&file.insn_list);
         hash_init(file.insn_hash);
-        file.whitelist = find_section_by_name(file.elf, "__func_stack_frame_non_standard");
+        file.whitelist = find_section_by_name(file.elf, ".discard.func_stack_frame_non_standard");
         file.rodata = find_section_by_name(file.elf, ".rodata");
         file.ignore_unreachables = false;
         file.c_file = find_section_by_name(file.elf, ".comment");