Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull core fixes from Ingo Molnar:
 "A handful of objtool updates, plus a documentation addition for
  __ab_c_size()"

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  objtool: Fix whitelist documentation typo
  objtool: Fix function fallthrough detection
  objtool: Don't use ignore flag for fake jumps
  overflow.h: Add comment documenting __ab_c_size()

2 files changed, 8 insertions, 5 deletions

diff --git a/tools/objtool/Documentation/stack-validation.txt b/tools/objtool/Documentation/stack-validation.txt
index 8df526c80b65..4dd11a554b9b 100644
--- a/tools/objtool/Documentation/stack-validation.txt
+++ b/tools/objtool/Documentation/stack-validation.txt
@@ -306,7 +306,7 @@ ignore it:
 
 - To skip validation of a file, add
 
-    OBJECT_FILES_NON_STANDARD_filename.o := n
+    OBJECT_FILES_NON_STANDARD_filename.o := y
 
   to the Makefile.
 
diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index ac743a1d53ab..7325d89ccad9 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -28,6 +28,8 @@
 #include <linux/hashtable.h>
 #include <linux/kernel.h>
 
+#define FAKE_JUMP_OFFSET -1
+
 struct alternative {
         struct list_head list;
         struct instruction *insn;
@@ -568,7 +570,7 @@ static int add_jump_destinations(struct objtool_file *file)
                     insn->type != INSN_JUMP_UNCONDITIONAL)
                         continue;
 
-                if (insn->ignore)
+                if (insn->ignore || insn->offset == FAKE_JUMP_OFFSET)
                         continue;
 
                 rela = find_rela_by_dest_range(insn->sec, insn->offset,
@@ -745,10 +747,10 @@ static int handle_group_alt(struct objtool_file *file,
                 clear_insn_state(&fake_jump->state);
 
                 fake_jump->sec = special_alt->new_sec;
-                fake_jump->offset = -1;
+                fake_jump->offset = FAKE_JUMP_OFFSET;
                 fake_jump->type = INSN_JUMP_UNCONDITIONAL;
                 fake_jump->jump_dest = list_next_entry(last_orig_insn, list);
-                fake_jump->ignore = true;
+                fake_jump->func = orig_insn->func;
         }
 
         if (!special_alt->new_len) {
@@ -1957,7 +1959,8 @@ static int validate_branch(struct objtool_file *file, struct instruction *first,
                         return 1;
                 }
 
-                func = insn->func ? insn->func->pfunc : NULL;
+                if (insn->func)
+                        func = insn->func->pfunc;
 
                 if (func && insn->ignore) {
                         WARN_FUNC("BUG: why am I validating an ignored function?",