|
@@ -4,9 +4,9 @@
|
|
|
#include <linux/idr.h>
|
|
|
#include <linux/slab.h>
|
|
|
#include <linux/spinlock.h>
|
|
|
+#include <linux/xarray.h>
|
|
|
|
|
|
DEFINE_PER_CPU(struct ida_bitmap *, ida_bitmap);
|
|
|
-static DEFINE_SPINLOCK(simple_ida_lock);
|
|
|
|
|
|
/**
|
|
|
* idr_alloc_u32() - Allocate an ID.
|
|
@@ -581,7 +581,7 @@ again:
|
|
|
if (!ida_pre_get(ida, gfp_mask))
|
|
|
return -ENOMEM;
|
|
|
|
|
|
- spin_lock_irqsave(&simple_ida_lock, flags);
|
|
|
+ xa_lock_irqsave(&ida->ida_rt, flags);
|
|
|
ret = ida_get_new_above(ida, start, &id);
|
|
|
if (!ret) {
|
|
|
if (id > max) {
|
|
@@ -591,7 +591,7 @@ again:
|
|
|
ret = id;
|
|
|
}
|
|
|
}
|
|
|
- spin_unlock_irqrestore(&simple_ida_lock, flags);
|
|
|
+ xa_unlock_irqrestore(&ida->ida_rt, flags);
|
|
|
|
|
|
if (unlikely(ret == -EAGAIN))
|
|
|
goto again;
|
|
@@ -615,8 +615,8 @@ void ida_simple_remove(struct ida *ida, unsigned int id)
|
|
|
unsigned long flags;
|
|
|
|
|
|
BUG_ON((int)id < 0);
|
|
|
- spin_lock_irqsave(&simple_ida_lock, flags);
|
|
|
+ xa_lock_irqsave(&ida->ida_rt, flags);
|
|
|
ida_remove(ida, id);
|
|
|
- spin_unlock_irqrestore(&simple_ida_lock, flags);
|
|
|
+ xa_unlock_irqrestore(&ida->ida_rt, flags);
|
|
|
}
|
|
|
EXPORT_SYMBOL(ida_simple_remove);
|