rxrpc: remove smp_processor_id() from debug macro

[sfrench/cifs-2.6.git] / lib / idr.c

diff --git a/lib/idr.c b/lib/idr.c
index d0f1acdbfa3a6451299867f38143dce6104faf11..afbb0b1023d46cd5a3619175730c7ced7bc1e419 100644 (file)
--- a/lib/idr.c
+++ b/lib/idr.c
@@ -120,7 +120,7 @@ static int sub_alloc(struct idr *idp, int *starting_id, struct idr_layer **pa)
        int n, m, sh;
        struct idr_layer *p, *new;
        int l, id, oid;
-       long bm;
+       unsigned long bm;
 
        id = *starting_id;
  restart:
@@ -580,8 +580,7 @@ void *idr_replace(struct idr *idp, void *ptr, int id)
 }
 EXPORT_SYMBOL(idr_replace);
 
-static void idr_cache_ctor(void * idr_layer, struct kmem_cache *idr_layer_cache,
-               unsigned long flags)
+static void idr_cache_ctor(struct kmem_cache *idr_layer_cache, void *idr_layer)
 {
        memset(idr_layer, 0, sizeof(struct idr_layer));
 }