diff --git a/mm/vmscan.c b/mm/vmscan.c
index 189d562efccf..a86ad2881da5 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -2942,7 +2942,10 @@ static int kswapd(void *p)
 		}
 	}
 
+	tsk->flags &= ~(PF_MEMALLOC | PF_SWAPWRITE | PF_KSWAPD);
 	current->reclaim_state = NULL;
+	lockdep_clear_current_reclaim_state();
+
 	return 0;
 }