diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2003-03-29 17:17:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-03-29 17:17:00 -0800 |
| commit | b527eea4dc049bca0dd5d63de6555d8622965ba8 (patch) | |
| tree | 7b9cb584960af34fe009c4ba0f85ba024ab5527d /lib | |
| parent | 5e4301f1a686b8efeae458745928de2a4a75a2ec (diff) | |
| parent | 09fc33ed302304364734f5c56d456acdf2c0b536 (diff) | |
Merge bk://bk.arm.linux.org.uk/linux-2.5-pcmcia
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/idr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/idr.c b/lib/idr.c index 5e2c8f29da46..ca4b969e6009 100644 --- a/lib/idr.c +++ b/lib/idr.c @@ -150,7 +150,7 @@ EXPORT_SYMBOL(idr_pre_get); static inline int sub_alloc(struct idr *idp, int shift, void *ptr) { - long n, v = 0; + int n, v = 0; struct idr_layer *p; struct idr_layer **pa[MAX_LEVEL]; struct idr_layer ***paa = &pa[0]; @@ -211,7 +211,7 @@ static inline int sub_alloc(struct idr *idp, int shift, void *ptr) int idr_get_new(struct idr *idp, void *ptr) { - long v; + int v; if (idp->id_free_cnt < idp->layers + 1) return (-1); |