summaryrefslogtreecommitdiff
path: root/arch/um/kernel
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2019-05-24 22:02:44 +0200
committerRichard Weinberger <richard@nod.at>2019-07-02 23:27:19 +0200
commitc7f04e87e444a4bdeced1b43ce961d31257414ab (patch)
treeebddb5af2e6c1a120e793d8a52539c48d4648e8f /arch/um/kernel
parent80bf6ceaf9310b3f61934c69b382d4912deee049 (diff)
um: Don't garbage collect in deactivate_all_fds()
My previous commit didn't actually address the whole issue with lockdep shutdown, I had another local modification that disabled lockdep but that wasn't sufficient alone, so had to do the other change. Another issue remained though - during kfree() we acquire locks and lockdep tries to annotate those with exactly the same issue in the other patch - we no longer have "current". So, just remove the garbage collection. There's no value in it anyway since we're going to shut down anyway and marking a slab object as free is now not very useful anymore. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um/kernel')
-rw-r--r--arch/um/kernel/irq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
index d532377f5808..efde1f16c603 100644
--- a/arch/um/kernel/irq.c
+++ b/arch/um/kernel/irq.c
@@ -401,7 +401,7 @@ int deactivate_all_fds(void)
);
to_free = to_free->next;
}
- garbage_collect_irq_entries();
+ /* don't garbage collect - we can no longer call kfree() here */
os_close_epoll_fd();
return 0;
}