linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / linux / idr.h

diff --git a/include/linux/idr.h b/include/linux/idr.h
index 8268034..d37c8d8 100644 (file)
--- a/include/linux/idr.h
+++ b/include/linux/idr.h
@@ -66,7 +66,7 @@ struct idr {
        .id_free        = NULL,                                 \
        .layers         = 0,                                    \
        .id_free_cnt    = 0,                                    \
-       .lock           = __SPIN_LOCK_UNLOCKED(name.lock),      \
+       .lock           = SPIN_LOCK_UNLOCKED,                   \
 }
 #define DEFINE_IDR(name)       struct idr name = IDR_INIT(name)
 
@@ -78,7 +78,6 @@ void *idr_find(struct idr *idp, int id);
 int idr_pre_get(struct idr *idp, gfp_t gfp_mask);
 int idr_get_new(struct idr *idp, void *ptr, int *id);
 int idr_get_new_above(struct idr *idp, void *ptr, int starting_id, int *id);
-void *idr_replace(struct idr *idp, void *ptr, int id);
 void idr_remove(struct idr *idp, int id);
 void idr_destroy(struct idr *idp);
 void idr_init(struct idr *idp);