diff mbox series

[RT,1/2] eventfd: Fix stable-rt v5.4.182-rt71 conflict fixup issue

Message ID 7ecbf796f7026cf007e9d03d251a9f04e89cd3e9.1647531549.git.zanussi@kernel.org
State New
Headers show
Series Linux v5.4.182-rt72-rc1 | expand

Commit Message

Tom Zanussi March 17, 2022, 3:39 p.m. UTC 
From: Tom Zanussi <zanussi@kernel.org>

v5.4.182-rt72-rc1 stable review patch.
If anyone has any objections, please let me know.

-----------


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>
---
 include/linux/sched.h | 8 --------
 1 file changed, 8 deletions(-)
diff mbox series

Patch

diff --git a/include/linux/sched.h b/include/linux/sched.h
index e1dfb01f4623..91f1aac3c86a 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -802,14 +802,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;