diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2022-07-10 14:26:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-07-10 14:26:49 -0700 |
| commit | 24f4b40ec2184f3698faed3082895fcc1f6be282 (patch) | |
| tree | 1a6a5839d7c7f3f3930204b46bb4b99ca1df28ee /lib | |
| parent | Merge tag 'dmaengine-fix-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine (diff) | |
| parent | ida: don't use BUG_ON() for debugging (diff) | |
| download | wireguard-linux-24f4b40ec2184f3698faed3082895fcc1f6be282.tar.xz wireguard-linux-24f4b40ec2184f3698faed3082895fcc1f6be282.zip | |
Merge branch 'hot-fixes' (fixes for rc6)
This is a collection of three fixes for small annoyances.
Two of these are already pending in other trees, but I really don't want
to release another -rc with these issues pending, so I picked up the
patches for these things directly. We'll end up with duplicate commits
eventually, I prefer that over having these issues pending.
The third one is just me getting rid of another BUG_ON() just because it
was reported and I dislike those things so much.
* merge 'hot-fixes' branch:
ida: don't use BUG_ON() for debugging
drm/aperture: Run fbdev removal before internal helpers
ptrace: fix clearing of JOBCTL_TRACED in ptrace_unfreeze_traced()
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/idr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/idr.c b/lib/idr.c index f4ab4f4aa3c7..7ecdfdb5309e 100644 --- a/lib/idr.c +++ b/lib/idr.c @@ -491,7 +491,8 @@ void ida_free(struct ida *ida, unsigned int id) struct ida_bitmap *bitmap; unsigned long flags; - BUG_ON((int)id < 0); + if ((int)id < 0) + return; xas_lock_irqsave(&xas, flags); bitmap = xas_load(&xas); |