tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 30a40b5925 ("sched: Clarify wake_up_q()'s write to task->wake_q.next") into android16-6.12

Browse Source 
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:
Greg Kroah-Hartman
2025-04-22 11:26:22 +00:00
parent db92d2187f 30a40b5925
commit 0e9d1a3218
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/sched/core.c
+3 -2
View File
@@ -1110,10 +1110,11 @@ void wake_up_q(struct wake_q_head *head)
struct task_struct *task;
task = container_of(node, struct task_struct, wake_q);
/* Task can safely be re-inserted now: */
node = node->next;
task->wake_q.next = NULL;
task->wake_q_count = head->count;
/* pairs with cmpxchg_relaxed() in __wake_q_add() */
WRITE_ONCE(task->wake_q.next, NULL);
/* Task can safely be re-inserted now. */
/*
* wake_up_process() executes a full barrier, which pairs with
tools/objtool/check.c
+9
View File
@@ -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);
}