Merge 77a5ed6b03 ("platform/x86/amd/pmf: Update PMF Driver for Compatibility with new PMF-TA") into android16-6.12
Steps on the way to 6.12.23 Change-Id: Ia4e42360874d99819127adfdbb6078e166f7377c Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
@@ -4153,7 +4153,7 @@ static bool ignore_unreachable_insn(struct objtool_file *file, struct instructio
|
||||
* It may also insert a UD2 after calling a __noreturn function.
|
||||
*/
|
||||
prev_insn = prev_insn_same_sec(file, insn);
|
||||
if (prev_insn->dead_end &&
|
||||
if (prev_insn && prev_insn->dead_end &&
|
||||
(insn->type == INSN_BUG ||
|
||||
(insn->type == INSN_JUMP_UNCONDITIONAL &&
|
||||
insn->jump_dest && insn->jump_dest->type == INSN_BUG)))
|
||||
@@ -4615,6 +4615,8 @@ static int disas_funcs(const char *funcs)
|
||||
char *cmd;
|
||||
|
||||
cross_compile = getenv("CROSS_COMPILE");
|
||||
if (!cross_compile)
|
||||
cross_compile = "";
|
||||
|
||||
objdump_str = "%sobjdump -wdr %s | gawk -M -v _funcs='%s' '"
|
||||
"BEGIN { split(_funcs, funcs); }"
|
||||
|
||||
Reference in New Issue
Block a user