tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'sched_urgent_for_v5.17_rc2_p2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull scheduler fix from Borislav Petkov:
"Make sure the membarrier-rseq fence commands are part of the reported
set when querying membarrier(2) commands through MEMBARRIER_CMD_QUERY"

* tag 'sched_urgent_for_v5.17_rc2_p2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
sched/membarrier: Fix membarrier-rseq fence command missing from query bitmask

Linus Torvalds 24f4db1f a96d3a5b

+5 -4
+5 -4
kernel/sched/membarrier.c
··· 147 147 #endif 148 148 149 149 #ifdef CONFIG_RSEQ 150 - #define MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ_BITMASK \ 150 + #define MEMBARRIER_PRIVATE_EXPEDITED_RSEQ_BITMASK \ 151 151 (MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ \ 152 - | MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_RSEQ_BITMASK) 152 + | MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED_RSEQ) 153 153 #else 154 - #define MEMBARRIER_CMD_PRIVATE_EXPEDITED_RSEQ_BITMASK 0 154 + #define MEMBARRIER_PRIVATE_EXPEDITED_RSEQ_BITMASK 0 155 155 #endif 156 156 157 157 #define MEMBARRIER_CMD_BITMASK \ ··· 159 159 | MEMBARRIER_CMD_REGISTER_GLOBAL_EXPEDITED \ 160 160 | MEMBARRIER_CMD_PRIVATE_EXPEDITED \ 161 161 | MEMBARRIER_CMD_REGISTER_PRIVATE_EXPEDITED \ 162 - | MEMBARRIER_PRIVATE_EXPEDITED_SYNC_CORE_BITMASK) 162 + | MEMBARRIER_PRIVATE_EXPEDITED_SYNC_CORE_BITMASK \ 163 + | MEMBARRIER_PRIVATE_EXPEDITED_RSEQ_BITMASK) 163 164 164 165 static void ipi_mb(void *info) 165 166 {