Merge 30a40b5925 ("sched: Clarify wake_up_q()'s write to task->wake_q.next") into android16-6.12
Steps on the way to 6.12.20 Resolves merge conflicts in: kernel/sched/core.c Change-Id: Ia97ae34a99e3bc2fb7c1aebc7e367493f64d4384 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
@@ -2061,6 +2061,14 @@ static int add_jump_table(struct objtool_file *file, struct instruction *insn,
|
||||
reloc_addend(reloc) == pfunc->offset)
|
||||
break;
|
||||
|
||||
/*
|
||||
* Clang sometimes leaves dangling unused jump table entries
|
||||
* which point to the end of the function. Ignore them.
|
||||
*/
|
||||
if (reloc->sym->sec == pfunc->sec &&
|
||||
reloc_addend(reloc) == pfunc->offset + pfunc->len)
|
||||
goto next;
|
||||
|
||||
dest_insn = find_insn(file, reloc->sym->sec, reloc_addend(reloc));
|
||||
if (!dest_insn)
|
||||
break;
|
||||
@@ -2078,6 +2086,7 @@ static int add_jump_table(struct objtool_file *file, struct instruction *insn,
|
||||
alt->insn = dest_insn;
|
||||
alt->next = insn->alts;
|
||||
insn->alts = alt;
|
||||
next:
|
||||
prev_offset = reloc_offset(reloc);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user