Skip to content

Commit

Permalink
um: Don't garbage collect in deactivate_all_fds()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Johannes Berg authored and Richard Weinberger committed Jul 2, 2019
1 parent 80bf6ce commit c7f04e8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/um/kernel/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit c7f04e8

Please sign in to comment.