diff options
| author | Tom Zanussi <zanussi@kernel.org> | 2022-03-12 10:05:52 -0600 |
|---|---|---|
| committer | Tom Zanussi <zanussi@kernel.org> | 2023-05-06 16:19:48 -0500 |
| commit | fae8ce0ac3d34193aa093a6b89492a1652014341 (patch) | |
| tree | a65eba3edfbfb85cc130d1db6c6209e041f52620 | |
| parent | ba92c51ac69fd20e3f9fed2449dfbf39dbdad252 (diff) | |
| download | linux-rt-fae8ce0ac3d34193aa093a6b89492a1652014341.tar.gz | |
eventfd: Fix stable-rt v5.4.182-rt71 conflict fixup issue
This fixes an issue in stable-rt release v5.4.182-rt71 where a hunk
from the context diff was inadvertently included in a conflict fixup
where it shouldn't have been. Remove those lines that don't belong.
Reported-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Tom Zanussi <zanussi@kernel.org>
| -rw-r--r-- | include/linux/sched.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index b2a3fa09f153..d90db748a49b 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -806,14 +806,6 @@ struct task_struct { /* to be used once the psi infrastructure lands upstream. */ unsigned use_memdelay:1; #endif -#ifdef CONFIG_PSI - /* Stalled due to lack of memory */ - unsigned in_memstall:1; -#endif -#ifdef CONFIG_PAGE_OWNER - /* Used by page_owner=on to detect recursion in page tracking. */ - unsigned in_page_owner:1; -#endif #ifdef CONFIG_EVENTFD /* Recursion prevention for eventfd_signal() */ unsigned in_eventfd_signal:1; |