|
@@ -585,12 +585,11 @@ static void idr_cache_ctor(struct kmem_cache *idr_layer_cache, void *idr_layer)
|
|
memset(idr_layer, 0, sizeof(struct idr_layer));
|
|
memset(idr_layer, 0, sizeof(struct idr_layer));
|
|
}
|
|
}
|
|
|
|
|
|
-static int init_id_cache(void)
|
|
|
|
|
|
+void __init idr_init_cache(void)
|
|
{
|
|
{
|
|
- if (!idr_layer_cache)
|
|
|
|
- idr_layer_cache = kmem_cache_create("idr_layer_cache",
|
|
|
|
- sizeof(struct idr_layer), 0, 0, idr_cache_ctor);
|
|
|
|
- return 0;
|
|
|
|
|
|
+ idr_layer_cache = kmem_cache_create("idr_layer_cache",
|
|
|
|
+ sizeof(struct idr_layer), 0, SLAB_PANIC,
|
|
|
|
+ idr_cache_ctor);
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -602,7 +601,6 @@ static int init_id_cache(void)
|
|
*/
|
|
*/
|
|
void idr_init(struct idr *idp)
|
|
void idr_init(struct idr *idp)
|
|
{
|
|
{
|
|
- init_id_cache();
|
|
|
|
memset(idp, 0, sizeof(struct idr));
|
|
memset(idp, 0, sizeof(struct idr));
|
|
spin_lock_init(&idp->lock);
|
|
spin_lock_init(&idp->lock);
|
|
}
|
|
}
|